diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 9cf773df5e..8326910f91 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -620,7 +620,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec } @Override - public boolean recordCause(String key, String name, String reason) { + public boolean recordCause(String key, String name, String id, String reason) { if (recordCauseParam == null) { recordCauseParam = new RecordCauseParam(); } @@ -628,6 +628,7 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec result.setKey(key); result.setFilename(name); result.setReason(reason); + result.setId(id); recordCauseParam.setResult(result); return sendWsMessage(gson.toJson(recordCauseParam)); } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index 14eb8a4165..94049fe969 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -248,8 +248,8 @@ public class AdasManager implements IAdasNetCommApi { } @Override - public boolean recordCause(String key, String name, String reason) { - return mChannel.recordCause(key, name, reason); + public boolean recordCause(String key, String name, String id, String reason) { + return mChannel.recordCause(key, name, id, reason); } @Override diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java index 20f3a04474..3004ea1536 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java @@ -57,7 +57,16 @@ public interface IAdasNetCommApi { boolean stopRecord(int type, int id); - boolean recordCause(String key, String name, String reason); + /** + * 采集类型 + * + * @param key 工控机返回的 + * @param name 文件名称 也是工控机返回 + * @param id 接管原因id + * @param reason 接管原因 + * @return + */ + boolean recordCause(String key, String name, String id, String reason); /** * 设置车速 diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/SSHResult.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/SSHResult.java index 2c18901d23..d9f16e9219 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/SSHResult.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/SSHResult.java @@ -9,13 +9,14 @@ public class SSHResult { /** * 工控机IP未知 */ - int IP_UNKNOWN = -2; + int IP_UNKNOWN = -10001; /** * 网络异常或连接异常或IO异常 */ - int ERROR = -1; + int ERROR = -10000; /** - * 命令下发成功 + * 命令下发成功 可能存在-1的情况 + * 在虚拟机的ubuntu系统发送reboot或shutdown或ls 命令返回的是0,在工控机发送reboot或shutdown返回-1 ls返回0 */ int SEND_SUCCEED = 0; /** @@ -33,4 +34,13 @@ public class SSHResult { this.cmd = cmd; this.msg = msg; } + + @Override + public String toString() { + return "SSHResult{" + + "code=" + code + + ", cmd='" + cmd + '\'' + + ", msg='" + msg + '\'' + + '}'; + } } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/record/RecordCauseParam.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/record/RecordCauseParam.java index 2669464d61..9190a5fa01 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/record/RecordCauseParam.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/bean/record/RecordCauseParam.java @@ -2,7 +2,7 @@ package com.zhidao.support.adas.high.bean.record; /** * @author song kenan - * @des 同步采集类型 + * @des 采集类型 * @date 2021/8/25 */ @@ -29,6 +29,8 @@ public class RecordCauseParam { private String filename; //接管原因 private String reason; + //接管原因id + private String id; public String getKey() { return key; @@ -54,6 +56,13 @@ public class RecordCauseParam { this.reason = reason; } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } @Override