Sfoglia il codice sorgente

receive报文检验错误。

tom 3 mesi fa
parent
commit
b9c3d09ace

+ 12 - 0
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/HardwareCommDebugController.java

@@ -2,6 +2,7 @@ package com.ruoyi.sim.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.sim.service.impl.CommBuildService;
 import com.ruoyi.sim.service.impl.CommSendService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,6 +18,8 @@ public class HardwareCommDebugController extends BaseController {
     @Autowired
     private CommSendService commSendService;
     @Autowired
+    private CommBuildService commBuildService;
+    @Autowired
     private ApplicationContext applicationContext;
 
     @GetMapping(value = "/spring-boot-close")
@@ -89,4 +92,13 @@ public class HardwareCommDebugController extends BaseController {
                                                       @RequestParam final Boolean checkReplace) {
         return commSendService.debugWriteSelectedFaultBySimNum(simNum, faultIds, checkReplace);
     }
+
+    @GetMapping(value = "/debugBuildMsg/")
+    @ApiOperation("debugBuildMsg")
+    public AjaxResult debugBuildMsg(@RequestParam final String simNum,
+                                    @RequestParam final String cmd,
+                                    @RequestParam final String cmdId,
+                                    @RequestParam final String data) {
+        return commBuildService.debugBuildSendMsg(simNum, cmd, cmdId, data);
+    }
 }

+ 11 - 0
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommBuildService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.sim.service.impl;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.sim.domain.SimMsg;
 import com.ruoyi.sim.util.CRC16Modbus;
 import org.apache.commons.lang3.StringUtils;
@@ -7,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import static com.ruoyi.sim.service.impl.CommConst.*;
 
@@ -112,6 +114,14 @@ public class CommBuildService {
         return smS;
     }
 
+    public AjaxResult debugBuildSendMsg(@RequestParam final String simNum,
+                                        @RequestParam final String cmd,
+                                        @RequestParam final String cmdId,
+                                        @RequestParam final String data) {
+        SimMsg sm = buildSendMsg(simNum, cmd, cmdId, data);
+        return AjaxResult.success(sm);
+    }
+
     /**
      * check receiveMsg
      *
@@ -141,6 +151,7 @@ public class CommBuildService {
             return false;
         }
         // 计算CRC16
+        // todo: receive报文检验错误。
         if (false) {
             String crcContent = receiveMsg.substring(0, 18);
             l.debug("crcContent: {}", crcContent.toUpperCase());