配置充电桩

ruoyi-admin/src/main/resources/application-prod.yml

@@ -65,36 +65,41 @@ logging:
 
 # 是否开启服务
 init-task:
-    autosend: false # 自动下发任务
-    aciservice: false # ndc通讯
-
+    autosend: true # 自动下发任务
+    aciservice: true # ndc通讯
 
+modbus:
+    tcp-master:
+        fifth: # 充电桩
+            open: true
+            host: 192.168.10.220
+            port: 8899
 
     # plc连接配置
 plc:
     plcList[0]:
-        ip: 192.168.100.101
+        ip: 192.168.10.101
         enable: true
         name: packingMachine_1Plc
         ePlcType: S1200
         heartbeat: DB5000.2
         confirmTheStatus:
     plcList[1]:
-        ip: 192.168.100.102
+        ip: 192.168.10.102
         enable: true
         name: packingMachine_2Plc
         ePlcType: S1200
         heartbeat: DB5000.2
         confirmTheStatus:
     plcList[2]:
-        ip: 192.168.100.103
+        ip: 192.168.10.103
         enable: true
         name: packingMachine_3Plc
         ePlcType: S1200
         heartbeat: DB5000.2
         confirmTheStatus:
     plcList[3]:
-        ip: 192.168.100.104
+        ip: 192.168.10.104
         enable: true
         name: stackingMachinePlc
         ePlcType: S1200

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/AciService.java

@@ -38,7 +38,7 @@ public class AciService {
 
     private static final int BUFF_SIZE = 2048;
 
-    private static final String IP_ADDR = "192.168.100.130";
+    private static final String IP_ADDR = "192.168.10.130";
 
     private static final int IP_PORT = 30002;
 

warewms-hard/src/main/java/com/ruoyi/hard/modbus/tcp/ChargingMachineClient.java

@@ -47,7 +47,6 @@ public class ChargingMachineClient {
     @PostConstruct
     public void initMap() {
         tcpMasterTemplateMap = new HashMap<>();
-        tcpMasterTemplateMap.put(MACHINE_NO.A.name(), modbusTcpMasterTemplateFourth);
         tcpMasterTemplateMap.put(MACHINE_NO.B.name(), modbusTcpMasterTemplateFifth);
     }
 
@@ -59,8 +58,7 @@ public class ChargingMachineClient {
      * 机器编号
      */
     public enum MACHINE_NO {
-        A("1",1),
-        B("2",2);
+        B("13",2);
 
         private String value;
         private int no;