优化plc连接配置及配置文件

shkj-admin/pom.xml

@@ -121,7 +121,7 @@
                 </configuration>
             </plugin>
         </plugins>
-        <finalName>mjk2-admin</finalName>
+        <finalName>kmv2-admin</finalName>
     </build>
 
     <repositories>

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

@@ -12,10 +12,10 @@ spring:
     druid:
       # 主库数据源
       master:
-        #url: jdbc:mysql://127.0.0.1:3306/mjk_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
+        url: jdbc:mysql://127.0.0.1:3306/mjk_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
-        url: jdbc:mysql://120.77.94.227:3306/mjk_wcs_2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #url: jdbc:mysql://120.77.94.227:3306/mjk_wcs_2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: CTlTwKgIrRVTsEHqxxx
+        #password: CTlTwKgIrRVTsEHqxxx
         # password: 123456
         # password: Y4yhl9tbf110
       # 从库数据源

shkj-admin/src/main/resources/application-pro.yml

@@ -2,7 +2,7 @@
 shkj:
   # 文件路径 示例（ Windows配置D:/shkj/uploadPath，Linux配置 /home/shkj/uploadPath）
   profile: /www/shkj_v2/static
-  urlPre: http://120.77.94.227:8041
+  urlPre: http://127.0.0.1:8041
 
 # 数据源配置
 spring:
@@ -12,7 +12,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://127.0.0.1:3306/kmv2_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
+        url: jdbc:mysql://localhost:3306/kmv2_wcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
         username: root
         password: Mjk@2024_Kmv2
       # 从库数据源

shkj-admin/src/main/resources/application-test.yml

@@ -14,7 +14,7 @@ spring:
       master:
         url: jdbc:mysql://127.0.0.1:3306/mjk_wcs_2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: Sh@2024_
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

shkj-admin/src/main/resources/application-yun.yml

@@ -0,0 +1,111 @@
+# 项目相关配置
+shkj:
+  # 文件路径 示例（ Windows配置D:/shkj/uploadPath，Linux配置 /home/shkj/uploadPath）
+  profile: /www/mjk/uploadPath
+  urlPre:
+
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://120.77.94.227:3306/mjk_wcs_2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: CTlTwKgIrRVTsEHqxxx
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: shkj
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+
+  # redis 配置
+  redis:
+    # 地址
+    host: localhost
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 3
+    # 密码
+    password:
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+third:
+  #  agv接口
+  agvCreateTaskUrl: http://127.0.0.1:8081/rest/common/createTask
+  agvStatesUrl: http://127.0.0.1:8081/rest/robots/states
+  agvCancelTaskUrl: http://127.0.0.1:8081/rest/common/cancelTask
+  queryAckByTaskUrl: http://127.0.0.1:8081/rest/common/queryAckByTaskId
+  # ess接口
+  essTaskDistributionUrl: http://210.21.218.14:60354/task/create
+  essTaskCancelUrl: http://210.21.218.14:60354/task/cancel
+  #  输送线接口
+  moveContainerUrl: http://210.21.218.14:60354/conveyor/moveContainer
+  containerArrivedUrl: http://210.21.218.14:60354/conveyor/containerArrived
+  #  播种墙 电子标签
+  tagSendTaskUrl: http://210.21.218.14:60354/PTL/SendDASData
+  tagPickingDetailsUrl: http://210.21.218.14:60354/PTL/DASPickingDetails
+  #  erp接口
+  erpU8PuStoreInUrl: http://192.168.1.99:13001/api/U8PuStoreIn/Add
+  erpU8MaterialOutUrl: http://192.168.1.99:13001/api/U8MaterialOut/Add
+
+plc:
+  firstBarcode: DB320.DBD82
+  secondBarcode: DB320.DBD104
+  thirdBarcode: DB320.DBD12
+  containerCode: DB320.DBD6

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

@@ -45,7 +45,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: pro
+    active: test
   # 文件上传
   servlet:
      multipart:

shkj-wms/src/main/java/com/shkj/wcs/plc/PlcEventTask.java

@@ -78,13 +78,13 @@ public class PlcEventTask {
     @Autowired
     PlcInit plcInit;
 
-    @Scheduled(fixedDelay = 8000)
+    @Scheduled(fixedDelay = 4000)
     public void init() {
         //查询需要连接的PLC,初始化连接对象
-        List<WcsPlcConnectVo> plcList = iWcsPlcConnectService.selectWcsPlcConnectList(new WcsPlcConnect().setIsActive("1"));
+        List<WcsPlcConnectVo> plcList =(List<WcsPlcConnectVo>) redisTemplate.opsForValue().get(RedisConstant.redisPlcListConnect);
-
+        if (plcList == null || plcList.size()==0) {
-        if (plcList.size() == 0) {
+            plcList = iWcsPlcConnectService.selectWcsPlcConnectList(new WcsPlcConnect().setIsActive("1"));
-            return;
+            redisTemplate.opsForValue().set(RedisConstant.redisPlcListConnect,plcList);
         }
 
         for (WcsPlcConnectVo conn : plcList) {

shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinStockInvServiceImpl.java

@@ -171,6 +171,7 @@ public class BusinStockInvServiceImpl extends ServiceImpl<BusinStockInvMapper, B
             //inv.setInvWay(bo.getInvWay());
             inv.setInvWay(InvWayEnum.open.getValue());
             inv.setBranchId(stockLot.getBranchId());
+            inv.setLayer(bo.getLayer());
             addList.add(inv);
         }