Forráskód Böngészése

添加 方向 参数。

tom 3 hónapja
szülő
commit
b5e96d1ee4

+ 8 - 7
ruoyi-sim/src/main/java/com/ruoyi/sim/controller/HardwareCommDebugController.java

@@ -93,12 +93,13 @@ public class HardwareCommDebugController extends BaseController {
         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);
+    @GetMapping(value = "/buildMsg/")
+    @ApiOperation("buildMsg")
+    public AjaxResult buildSendMsg(@RequestParam final String simNum,
+                                   @RequestParam final String orn,
+                                   @RequestParam final String cmd,
+                                   @RequestParam final String cmdId,
+                                   @RequestParam final String data) {
+        return commBuildService.buildSendMsgAR(simNum, orn, cmd, cmdId, data);
     }
 }

+ 18 - 9
ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/CommBuildService.java

@@ -9,7 +9,6 @@ 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.constant.CommConst.*;
 
@@ -67,10 +66,19 @@ public class CommBuildService {
     }
 
     public SimMsg buildSendMsg(final String simNum, final String cmd, final String cmdId) {
-        return buildSendMsg(simNum, cmd, cmdId, CMD_DATA_PLACE_HOLDER);
+        return buildSendMsg(simNum, ORN_SEND, cmd, cmdId, CMD_DATA_PLACE_HOLDER);
     }
 
-    public SimMsg buildSendMsg(final String simNum, final String cmd, final String cmdId, final String data) {
+    /**
+     *
+     * @param simNum
+     * @param orn
+     * @param cmd
+     * @param cmdId
+     * @param data
+     * @return
+     */
+    public SimMsg buildSendMsg(final String simNum, final String orn, final String cmd, final String cmdId, final String data) {
         SimMsg smS = new SimMsg();
         smS.setSimMsgId(idService.nextId());
         if (StringUtils.isEmpty(simNum) || StringUtils.isEmpty(cmd) || StringUtils.isEmpty(cmdId) || StringUtils.isEmpty(data)) {
@@ -91,7 +99,7 @@ public class CommBuildService {
         StringBuffer m = new StringBuffer();
         m.append(PREFIX);
         m.append(simNum);
-        m.append(ORN_SEND);
+        m.append(orn);
         m.append(cmd);
         m.append(cmdId);
         m.append(data);
@@ -115,11 +123,12 @@ 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);
+    public AjaxResult buildSendMsgAR(final String simNum,
+                                     final String orn,
+                                     final String cmd,
+                                     final String cmdId,
+                                     final String data) {
+        final SimMsg sm = buildSendMsg(simNum, orn, cmd, cmdId, data);
         return AjaxResult.success(sm);
     }