马钢二期 --init

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -51,68 +51,4 @@ public class StartService implements CommandLineRunner {
             thread.start();
         }
     }
-
-
-    /**
-     * 自动接驳位任务
-     * 1.扫描有货的接驳位，如果标记是ASN则进行自动入库
-     * 2.扫描有货的接驳位，如果标记是SO则进行自动出库
-     */
-    public void autoTranSitTask() {
-        autoTranSitTask.run();
-    }
-
-    /**
-     * 自动RFID读取任务(墙外)
-     * 1.带有标签的人工叉车靠近RFID阅读器,开启自动门
-     * 2.带有标签的人工叉车离开RFID阅读器,关闭自动门
-     */
-    public void autoRfidReaderTask() {
-        autoRfidReaderTask.run();
-    }
-
-    /**
-     * 自动RFID读取任务(室内)
-     */
-    public void autoRfidReaderTask01() {
-        autoRfidReaderTask.run01();
-    }
-
-    /**
-     * 自动按钮盒监控任务
-     * 1.人工卸完货之后按下冲边按钮，触发冲边搬运任务
-     * 2.人工卸完货之后按下硫化按钮，触发硫化搬运任务
-     */
-    public void autoButtonBoxTask() {
-        autoButtonBoxTask.run();
-    }
-
-    /**
-     * 空托盘入库测试
-     *
-     * @param locationFrom
-     */
-    public void emptyPalletStorage(String locationFrom) {
-        // 验证起始点是否空闲
-        Boolean isIdle = baseLocationInfoService.verifyLocationIsIdle(locationFrom,Constant.WAREHOUSE_ID);
-        if (!isIdle) {
-            return;
-        }
-        // 下发任务
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
-        agvCallDTO.setLocationFrom(locationFrom);
-        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku("EMPTY_TRAY");
-        agvCallItemDTO.setQty(1d);
-        agvCallItemDTO.setWeight(1d);
-        LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt01("EMPTY_TRAY");
-        lotattDTO.setLotatt05("90");
-        agvCallItemDTO.setLotattDTO(lotattDTO);
-        agvCallItemDTOList.add(agvCallItemDTO);
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        businessService.agvCall(Constant.IN_TRAN_FLOW_ID, agvCallDTO);
-    }
 }

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

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.100.220.92:3306/wareams?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.100.220.92:3306/warewms-magang02?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: warewms
                 password: warewms123
             # 从库数据源
@@ -67,49 +67,4 @@ 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
 

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

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/warewms-hualan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/warewms-magang02?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: warewms
                 password: warewms123
             # 从库数据源
@@ -67,49 +67,4 @@ init-task:
     autosend: true # 自动下发任务
     aciservice: true # ndc通讯
 
-modbus:
-    tcp-master:
-        first: # 自动门(靠马路)
-            open: true
-            host: 192.168.42.201
-            port: 9000
-        second: # 自动门(靠里面)
-            open: true
-            host: 192.168.42.202
-            port: 9000
-        sixth: # 自动门(靠马路-第二层)
-            open: true
-            host: 192.168.42.210
-            port: 9000
-        seventh: # 卷帘门
-            open: true
-            host: 192.168.42.211
-            port: 9000
-        third: # 按钮盒
-            open: true
-            host: 192.168.42.205
-            port: 9000
-        fourth: # 充电机（三向车）
-            open: true
-            host: 192.168.42.208
-            port: 8899
-        fifth: # 充电机（迷你堆垛）
-            open: true
-            host: 192.168.42.209
-            port: 8899
-
-
-rfid:
-    first: # 靠马路
-        open: true
-        host: 192.168.42.203
-        port: 5084
-        number-of-tags: 3 # 一次读取标签的数量
-        timeout-milliseconds: 5000
-    second: # 靠里面
-        open: true
-        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: dev
+    active: prod
   # 文件上传
   servlet:
     multipart: