AjaxResult msg isBlank 表示检查成功,否则失败。

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommReceiveService.java

@@ -142,7 +142,7 @@ public class CommReceiveService {
      * @param sm
      * @param s
      * @param f
-     * @return
+     * @return AjaxResult msg isBlank 表示检查成功,否则失败。
      */
     public AjaxResult getOneFaultCheck(SimMsg sm, Sim s, Fault f) {
         String checkValue = CommParseUtils.subContentData(sm);
@@ -152,7 +152,7 @@ public class CommReceiveService {
         // 是否在 故障部位 跳过检查 白名单中。
         if (FaultConst.FAULT_SET_CHECK_PASS.contains(f.getFaultId())) {
             // 跳过检查，直接成功。
-            return AjaxResult.success(f);
+            return AjaxResult.success("", f);
         }
         // 是否是 2型的维护管 或 3型的维护管
         if (FaultConst.FAULT_SET_WHG.contains(f.getFaultId())) {

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommSendService.java

@@ -698,12 +698,16 @@ public class CommSendService {
         List<Fault> listNG = new ArrayList<>();
         for (Fault f : list) {
             AjaxResult ar = readOneSimOneFaultCheck(seat, sim, f);
+
             if (!StringUtils.isBlank((String) ar.get(AjaxResult.MSG_TAG))) {
                 listNG.add(f);
                 l.info("故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]未正确安装;");
             } else {
                 l.info("故障部位[" + f.getBindHardwareMsg() + "][" + f.getReplaceName() + "]安装ok;");
             }
+            if (ar.isError()) {
+                return ar;
+            }
         }
         if (listNG.isEmpty()) {
             return AjaxResult.success("所有故障部位检查没有问题。");
@@ -909,16 +913,16 @@ public class CommSendService {
                 AjaxResult ar = commReceiveService.checkReceiveMsgFormat(sm.getReceiveMsg());
                 if (ar.isError()) {
                     // todo:
-                    l.warn("####接收错误#### = {}", sm);
+                    l.warn("####接收错误@格式错误#### = {}", sm);
                     sm.setResult(SimMsg.Result.RECEIVE_CHECK_FAIL);
                     return sm;
                 }
             }
-            {
+            if (false) {
                 AjaxResult ar = commReceiveService.checkReceiveMsgMatch(sm);
                 if (ar.isError()) {
                     // todo:
-                    l.warn("####接收错误#### = {}", sm);
+                    l.warn("####接收错误@匹配错误#### = {}", sm);
                     sm.setResult(SimMsg.Result.RECEIVE_NOT_MATCH);
                     return sm;
                 }