初始化库位信息

pom.xml

@@ -35,6 +35,8 @@
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <skipTests>true</skipTests>
+        <guava.retry.version>2.0.0</guava.retry.version>
+        <iotCommunication.version>1.4.2</iotCommunication.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -229,6 +231,20 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.github.rholder</groupId>
+                <artifactId>guava-retrying</artifactId>
+                <version>${guava.retry.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.xingshuangs</groupId>
+                <artifactId>iot-communication</artifactId>
+                <version>${iotCommunication.version}</version>
+            </dependency>
+
+
+
         </dependencies>
     </dependencyManagement>
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/WcsTaskController.java

@@ -120,7 +120,7 @@ public class WcsTaskController extends BaseController {
         if (StringUtils.isNotEmpty(wcsTask.getAgvNo())) {
             agvNo = Integer.parseInt(wcsTask.getAgvNo());
         }
-        return wcsTaskService.callBack(wcsTask.getTaskNo(), 4, agvNo);
+        return wcsTaskService.callBack(wcsTask.getTaskNo(), 6, agvNo);
     }
 
     @Log(title = "任务取消", businessType = BusinessType.INSERT)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/tianao/TianaoApiContoller.java

@@ -60,4 +60,5 @@ public class TianaoApiContoller extends BaseController {
         return tianaoService.testAgvAddress(car);
     }
 
+
 }

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

@@ -1,4 +1,4 @@
-# 数据源配置
+ # 数据源配置
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
@@ -64,52 +64,6 @@ logging:
 
 # 是否开启服务
 init-task:
-    autosend: false # 自动下发任务
-    aciservice: false # ndc通讯
-
-modbus:
-    tcp-master:
-        first: # 自动门(靠马路)
-            open: false
-            host: 192.168.42.201
-            port: 9000
-        second: # 自动门(靠里面)
-            open: false
-            host: 192.168.42.202
-            port: 9000
-        sixth: # 自动门(靠马路-第二层)
-            open: false
-            host: 192.168.42.210
-            port: 9000
-        seventh: # 卷帘门
-            open: false
-            host: 192.168.42.211
-            port: 9000
-        third: # 按钮盒
-            open: false
-            host: 192.168.42.205
-            port: 9000
-        fourth: # 充电机（三向车）
-            open: false
-            host: 192.168.42.208
-            port: 8899
-        fifth: # 充电机（迷你堆垛）
-            open: false
-            host: 192.168.42.209
-            port: 8899
-
-# 注意：这玩意只能跑在window上
-rfid:
-  first:
-      open: false
-      host: 169.168.42.203
-      port: 5084
-      number-of-tags: 3 # 一次读取标签的数量
-      timeout-milliseconds: 5000
-  second: # 靠里面
-      open: false
-      host: 192.168.42.204
-      port: 5084
-      number-of-tags: 3 # 一次读取标签的数量
-      timeout-milliseconds: 5000
+    autosend: true # 自动下发任务
+    aciservice: true # ndc通讯
 

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

@@ -69,47 +69,11 @@ init-task:
 
 modbus:
     tcp-master:
-        first: # 自动门(靠马路)
-            open: false
-            host: 192.168.42.201
-            port: 9000
-        second: # 自动门(靠里面)
-            open: false
-            host: 192.168.42.202
-            port: 9000
-        sixth: # 自动门(靠马路-第二层)
-            open: false
-            host: 192.168.42.210
-            port: 9000
-        seventh: # 卷帘门
-            open: false
-            host: 192.168.42.211
-            port: 9000
-        third: # 按钮盒
-            open: false
-            host: 192.168.42.205
-            port: 9000
         fourth: # 充电机（三向车）
-            open: false
+            open: true
             host: 192.168.42.208
             port: 8899
         fifth: # 充电机（迷你堆垛）
-            open: false
+            open: true
             host: 192.168.42.209
             port: 8899
-
-
-rfid:
-    first: # 靠马路
-        open: false
-        host: 192.168.42.203
-        port: 5084
-        number-of-tags: 3 # 一次读取标签的数量
-        timeout-milliseconds: 5000
-    second: # 靠里面
-        open: false
-        host: 192.168.42.204
-        port: 5084
-        number-of-tags: 3 # 一次读取标签的数量
-        timeout-milliseconds: 5000
-

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

@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: dev
   # 文件上传
   servlet:
     multipart:
@@ -123,3 +123,12 @@ tianao:
   address: http://61.169.55.83:7225
   taskBackUrl: http://61.169.55.83:7225/Api_Changlian/ForksUpdateTask
   AGVStatusBackUrl: http://61.169.55.83:7225/Api_Changlian/ForksUpdateAgvAxis
+
+# plc连接配置
+plc:
+  plcList[0]:
+    ip: 192.168.2.151
+    enable: false
+    name: conveyorBeltsPlc
+    ePlcType: S1200
+    heartbeat: DB1051.0.0