更新

hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java

@@ -845,12 +845,16 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 }
                                 break;
                             case 1:
-                                TaskDto taskDto = taskService.findByCode(inst.getTask_code());
-                                boolean tag = false;
-                                if (StrUtil.startWith(inst.getTask_code(), "-") || StrUtil.equals(taskDto.getTask_type(), "3")) {
-                                    tag = true;
+                                TaskDto taskDto = null;
+                                if (ObjectUtil.isNotEmpty(inst)) {
+                                    taskDto = taskService.findByCode(inst.getTask_code());
+                                }
+                                boolean tag = false;
+                                if(ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isNotEmpty(inst) ){
+                                    if (StrUtil.startWith(inst.getTask_code(), "-") || StrUtil.equals(taskDto.getTask_type(), "3")) {
+                                        tag = true;
+                                    }
                                 }
-
                                 //开始任务/上报订单号（无车id及状态）
                                 if (phase == 0x01) {
                                     data = AgvService.sendAgvOneModeInst(phase, index);

hd/nladmin-system/src/main/resources/config/application-prod.yml

@@ -1,22 +1,32 @@
 server:
   port: 8010
+#ERP系统相关
+erp:
+  oracle:
+    enabled: true
+    jdbcurl: jdbc:oracle:thin:@10.16.1.30:1521:xrrun
+    username: erp
+    password: erp
+  sqlserver:
+    enabled: false
+    jdbcurl: jdbc:sqlserver://47.97.157.227:1433;DatabaseName=testdb-lx
+    username: sa
+    password: Nl@123
 #配置数据源
 spring:
-  profiles:
-    prod
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ndxy_acs1}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:10.16.1.25}:${DB_PORT:3306}/${DB_NAME:whxr_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:whxr_root}
       # 初始连接数
       initial-size: 5
       # 最小连接数
       min-idle: 15
       # 最大连接数
-      max-active: 30
+      max-active: 60
       # 获取连接超时时间
       max-wait: 5000
       # 连接有效性检测时间
@@ -55,12 +65,29 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
-    database: ${REDIS_DB:0}
-    host: ${REDIS_HOST:127.0.0.1}
+    database: ${REDIS_DB:15}
+    host: ${REDIS_HOST:10.16.1.25}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
     #连接超时时间
     timeout: 5000
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 4
+  # Netty线程池数量
+  nettyThreads: 8
+  # 单节点配置
+  singleServerConfig:
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 8
+    # 连接池大小
+    connectionPoolSize: 32
+    # 连接空闲超时，单位：毫秒
+    idleConnectionTimeout: 10000
+    # 命令等待超时，单位：毫秒
+    timeout: 3000
 # 登录相关配置
 login:
   # 登录缓存
@@ -119,7 +146,7 @@ generator:
 
 #是否开启 swagger-ui
 swagger:
-  enabled: true
+  enabled: false
 
 # 文件存储路径
 file:
@@ -135,3 +162,7 @@ file:
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
+logging:
+  file:
+    path: /app/jar/logs
+  config: classpath:logback-spring.xml

hd/nladmin-system/src/main/resources/config/application.yml

@@ -43,7 +43,7 @@ rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 logging:
   file:
-    path: C:\logs\nlacs\
+    path: D:\logs\nlacs\
 
 acsTowms:
   token: Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiJiZTVmOGZiZDcyMWU0NGFiODRlOGI4NTE4ODE5OWM0ZiIsImF1dGgiOiJ1c2VyOmxpc3QsbW9uaXRvcjpsaXN0Iiwic3ViIjoiYWNzIn0.JGga-TcIHTt76KT_m_7bt-fxdBUdwdRfRjXzwLyPLVLLPoOSXbVPbf2q6vcV-fh33r2wyrBEleWYVPOEvjrZMw