|
@@ -161,12 +161,15 @@ public class CommReceiveService {
|
|
|
if (WHG_MSG_EXIST_YES.equals(WHG_EXIST_MSG)) {
|
|
|
return AjaxResult.success("", f);
|
|
|
} else {
|
|
|
- return AjaxResult.success("故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]未正确安装;", f);
|
|
|
+ String msg = "故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]未正确安装;";
|
|
|
+ l.info(msg);
|
|
|
+ return AjaxResult.success(msg, f);
|
|
|
}
|
|
|
}
|
|
|
if (BLANK_CONTENT.equals(checkValue)) {
|
|
|
- l.info("故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]未正确安装;");
|
|
|
- return AjaxResult.success("故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]未正确安装;", f);
|
|
|
+ String msg = "故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]未正确安装;";
|
|
|
+ l.info(msg);
|
|
|
+ return AjaxResult.success(msg, f);
|
|
|
} else {
|
|
|
return AjaxResult.success("", f);
|
|
|
}
|
|
@@ -184,7 +187,7 @@ public class CommReceiveService {
|
|
|
receiveMsg = StringUtils.removeStartIgnoreCase(receiveMsg, CommConst.PREFIX_ERROR_0);
|
|
|
count = count + 1;
|
|
|
}
|
|
|
- l.info("####remove count#### = [{}]", count);
|
|
|
+ l.info("####remove '0' count#### = [{}]", count);
|
|
|
return receiveMsg;
|
|
|
}
|
|
|
|
|
@@ -259,16 +262,16 @@ public class CommReceiveService {
|
|
|
return AjaxResult.error("subSimNum不对应!");
|
|
|
}
|
|
|
// 1 型有问题。
|
|
|
-// if (!StringUtils.equals(CommParseUtils.subCmd(s), CommParseUtils.subCmd(r))) {
|
|
|
-// return AjaxResult.error("subCmd不对应!");
|
|
|
-// }
|
|
|
-// if (!StringUtils.equals(CommParseUtils.subCmdId(s), CommParseUtils.subCmdId(r))) {
|
|
|
-// return AjaxResult.error("subCmdId不对应!" +
|
|
|
-// CommParseUtils.subCmdId(s) +
|
|
|
-// "////" +
|
|
|
-// CommParseUtils.subCmdId(r)
|
|
|
-// );
|
|
|
-// }
|
|
|
+ if (!StringUtils.equals(CommParseUtils.subCmd(s), CommParseUtils.subCmd(r))) {
|
|
|
+ return AjaxResult.error("subCmd不对应!");
|
|
|
+ }
|
|
|
+ if (!StringUtils.equals(CommParseUtils.subCmdId(s), CommParseUtils.subCmdId(r))) {
|
|
|
+ return AjaxResult.error("subCmdId不对应!" +
|
|
|
+ CommParseUtils.subCmdId(s) +
|
|
|
+ "////" +
|
|
|
+ CommParseUtils.subCmdId(r)
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
return AjaxResult.success("接收报文匹配正确!");
|
|
|
}
|