移动PLC连接启动类解决Maven循环依赖

ruoyi-system/pom.xml

@@ -23,6 +23,22 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.rholder</groupId>
+            <artifactId>guava-retrying</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xingshuangs</groupId>
+            <artifactId>iot-communication</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+
     </dependencies>
 
-</project>
+</project>

warewms-tianao/src/main/java/com/ruoyi/tianao/config/MQTTConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.tianao.config;
+package com.ruoyi.system.config;
 
 import lombok.Getter;
 

warewms-tianao/src/main/java/com/ruoyi/tianao/config/PlcConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.tianao.config;
+package com.ruoyi.system.config;
 
 import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
 import lombok.Data;

warewms-tianao/src/main/java/com/ruoyi/tianao/config/PlcProperties.java

@@ -1,4 +1,4 @@
-package com.ruoyi.tianao.config;
+package com.ruoyi.system.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

warewms-tianao/src/main/java/com/ruoyi/tianao/enums/CnveyorBeltsPlcEnum.java

@@ -1,4 +1,4 @@
-package com.ruoyi.tianao.enums;
+package com.ruoyi.system.enums;
 
 public enum CnveyorBeltsPlcEnum {
 
@@ -6,6 +6,10 @@ public enum CnveyorBeltsPlcEnum {
 
     TO_COMMAND_4("DB1051.108.0"),
 
+    ACK_1("DB1051.4.0"),
+
+    ACK_4("DB1051.106.0"),
+
     MOVE_1("DB1050.14.0"),
 
     MOVE_4("DB1050.128.0");

warewms-tianao/src/main/java/com/ruoyi/tianao/init/PlcConnectServiceRunner.java

@@ -1,4 +1,4 @@
-package com.ruoyi.tianao.init;
+package com.ruoyi.system.init;
 
 
 import cn.hutool.core.util.ObjectUtil;
@@ -6,8 +6,8 @@ import com.github.rholder.retry.*;
 import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.tianao.config.PlcConfig;
-import com.ruoyi.tianao.config.PlcProperties;
+import com.ruoyi.system.config.PlcConfig;
+import com.ruoyi.system.config.PlcProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
@@ -137,7 +137,7 @@ public class PlcConnectServiceRunner implements CommandLineRunner {
     public S7PLC getPlcServer(String pclName) {
         S7PLC s7PLC = plcToolsMap.get(pclName);
         if(ObjectUtil.isNull(s7PLC)){
-            throw new ServiceException("设备未连接");
+            throw new ServiceException("The device is not connected");
         }
         return plcToolsMap.get(pclName);
     }

warewms-tianao/src/main/java/com/ruoyi/tianao/init/PublishAGVInfo.java

@@ -1,6 +1,6 @@
-package com.ruoyi.tianao.init;
+package com.ruoyi.system.init;
 
-import com.ruoyi.tianao.config.MQTTConfig;
+import com.ruoyi.system.config.MQTTConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;