Selaa lähdekoodia

配置文件修改

k 2 vuotta sitten
vanhempi
commit
1e72a081bf

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/test/ModbusTestController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ModbusTestController {
 
     @Autowired
-    private ModbusTcpMasterTemplate modbusTcpMasterTemplate;
+    private ModbusTcpMasterTemplate modbusTcpMasterTemplateFirst;
 
     /**
      * 自动门命令
@@ -59,7 +59,7 @@ public class ModbusTestController {
     @ApiOperation("读取")
     @PostMapping("/read")
     public AjaxResult read(int slaveId, int offset, int value) {
-        ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplate.getModbusMasterUtil();
+        ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateFirst.getModbusMasterUtil();
         if (value > 0) {
             ReadResponse readResponse = modbusMasterUtil.readHoldingRegisters(slaveId, offset, value);
             byte[] data = readResponse.getData();
@@ -76,7 +76,7 @@ public class ModbusTestController {
     @ApiOperation("发送")
     @PostMapping("/send")
     public AjaxResult send(int slaveId, int offset, int value) {
-        ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplate.getModbusMasterUtil();
+        ModbusMasterUtil modbusMasterUtil = modbusTcpMasterTemplateFirst.getModbusMasterUtil();
         Boolean aBoolean = modbusMasterUtil.writeHoldingRegisters(slaveId, offset, value);
         return AjaxResult.success(aBoolean.toString());
     }

+ 7 - 4
ruoyi-admin/src/main/resources/application-dev.yml

@@ -70,7 +70,10 @@ logging:
 
 
 modbus:
-  tcp-master:
-      open: false
-      host: 127.0.0.1
-      port: 502
+    tcp-master:
+        first:
+            open: true
+            host: 127.0.0.1
+            port: 502
+
+

+ 5 - 3
ruoyi-admin/src/main/resources/application-prod.yml

@@ -67,8 +67,10 @@ logging:
         com.ruoyi: info
         org.springframework: info
 
+
 modbus:
     tcp-master:
-        open: true
-        host: 127.0.0.1
-        port: 502
+        first:
+            open: true
+            host: 127.0.0.1
+            port: 502