Sfoglia il codice sorgente

回复报文和发送报文匹配检查。

tom 2 mesi fa
parent
commit
bb334aeb52

+ 2 - 1
ruoyi-sim/src/main/java/com/ruoyi/sim/domain/SimMsg.java

@@ -273,8 +273,9 @@ public class SimMsg extends BaseEntity {
             return AjaxResult.error("回复报文格式错误!");
         } else if (Objects.equals(this.result, Result.RECEIVE_NOT_MATCH)) {
             return AjaxResult.error("回复报文不匹配!");
+        } else {
+            throw new IllegalArgumentException("参数错误!");
         }
-        return null;
     }
 
     public interface Result {

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

@@ -252,12 +252,16 @@ public class CommReceiveService {
             if (!StringUtils.equals(CommParseUtils.subSimNum(s), CommParseUtils.subSimNum(r))) {
                 return AjaxResult.error("subSimNum不对应!");
             }
-        }
-        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不对应!");
+            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("接收报文匹配正确!");
     }

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

@@ -913,16 +913,15 @@ public class CommSendService {
                 AjaxResult ar = commReceiveService.checkReceiveMsgFormat(sm.getReceiveMsg());
                 if (ar.isError()) {
                     // todo:
-                    l.warn("####接收错误@格式错误#### = {}", sm);
+                    l.warn("####接收错误@格式错误#### = sm = {},ar = {}", sm, ar);
                     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 = {},ar = {}", sm, ar);
                     sm.setResult(SimMsg.Result.RECEIVE_NOT_MATCH);
                     return sm;
                 }