fix

2023-12-16 14:06:23 +08:00
parent e587acb651
commit 6e2ecfc573
16 changed files with 334 additions and 75 deletions
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java
@@ -48,8 +48,8 @@ public class AcsToWmsController {
    }

    @PostMapping("/status")
-    @Log("设备状态同步")
-    @ApiOperation("设备状态同步")
+    @Log("任务状态同步")
+    @ApiOperation("任务状态同步")
    //@SaCheckPermission("@el.check('schBaseTask:add')")
    @SaIgnore
    public ResponseEntity<Object> status(@RequestBody JSONObject param) {
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
@@ -116,9 +116,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     */
    @Override
    public BaseResponse status(JSONObject param) {
+        log.info("ACS请求反馈任务状态,信息:{}!", param.toString());
        String requestNo = param.getString("requestNo");
-        FeedBackTaskStatusRequest taskStatusRequest = param.toJavaObject(FeedBackTaskStatusRequest.class);
-        String taskId = taskStatusRequest.getTask_id();
+        String taskId = param.getString("task_code");
        if (ObjectUtil.isEmpty(taskId)) {
            throw new BadRequestException("任务编码不能为空！");
        }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java
@@ -90,7 +90,7 @@ public class TBXBKJTask extends AbstractTask {
                continue;
            }
            // 设置终点并修改创建成功状态
-            task.setPoint_code1(point.getPoint_code());
+            task.setPoint_code1(point.getNext_wait_point());
            task.setTask_status(TaskStatus.CREATED.getCode());
            task.setRemark("");
            taskService.update(task);
@@ -186,5 +186,9 @@ public class TBXBKJTask extends AbstractTask {
    @Override
    protected void feedbackTaskState(JSONObject param,SchBaseTask schBaseTask, BaseResponse result) {
        //todo 重算最优点
+        SchBasePoint startPoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
+                .eq(SchBasePoint::getPoint_code, schBaseTask.getPoint_code2()));
+        SchBasePoint point = this.findNextPoint(startPoint);
+        schBaseTask.setPoint_code1(point.getPoint_code());
    }
 }
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml
@@ -7,7 +7,7 @@
        FROM
            `sch_base_point` p
        WHERE p.region_code like CONCAT('%', #{regionCode}, '%')
-        and p.point_status = #{point_status}
+        and p.point_status = #{point_status} and p.is_used = 1
        ORDER BY region_code
    </select>

--- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml
@@ -6,17 +6,21 @@ spring:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.121}:${DB_PORT:3306}/${DB_NAME:yy_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:cw_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
      username: ${DB_USER:root}
      password: ${DB_PWD:123456}
+      #      password: ${DB_PWD:P@ssw0rd}
      # 初始连接数
      initial-size: 5
      # 最小连接数
      min-idle: 15
      # 最大连接数
-      max-active: 60
+      max-active: 30
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
      # 获取连接超时时间
-      max-wait: 5000
+      max-wait: 3000
      # 连接有效性检测时间
      time-between-eviction-runs-millis: 60000
      # 连接在池中最小生存的时间
@@ -36,11 +40,8 @@ spring:
        enabled: true
      stat-view-servlet:
        enabled: true
-        # 控制台管理用户名和密码
        url-pattern: /druid/*
        reset-enable: false
-        login-username: admin
-        login-password: 123456
      filter:
        stat:
          enabled: true
@@ -53,12 +54,11 @@ spring:
            multi-statement-allow: true
  redis:
    #数据库索引
-    database: ${REDIS_DB:15}
+    database: ${REDIS_DB:2}
    host: ${REDIS_HOST:127.0.0.1}
    port: ${REDIS_PORT:6379}
    password: ${REDIS_PWD:}
-    #连接超时时间
-    timeout: 5000
+
 # 登录相关配置
 login:
  # 登录缓存
@@ -77,48 +77,23 @@ login:
    heigth: 36
    # 内容长度
    length: 2
-    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
+    # 字体名称，为空则使用默认字体
    font-name:
    # 字体大小
    font-size: 25

-#jwt
-jwt:
-  header: Authorization
-  # 令牌前缀
-  token-start-with: Bearer
-  # 必须使用最少88位的Base64对该令牌进行编码
-  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
-  # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 7200000
-  # 在线用户key
-  online-key: online-token-
-  # 验证码
-  code-key: code-key-
-  # token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
-  detect: 1800000
-  # 续期时间范围，默认 1小时，这里单位毫秒
-  renew: 3600000
+#是否允许生成代码，生产环境设置为false
+generator:
+  enabled: true
+
+#是否开启 swagger-ui
+swagger:
+  enabled: true

 # IP 本地解析
 ip:
  local-parsing: true

-#是否允许生成代码，生产环境设置为false
-generator:
-  enabled: false
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
-
-#是否开启 swagger-ui
-swagger:
-  enabled: false
-
 # 文件存储路径
 file:
  mac:
@@ -135,7 +110,7 @@ file:
  avatarMaxSize: 5
 logging:
  file:
-    path: /app/jar/logs
+    path: C:\log\wms
  config: classpath:logback-spring.xml

 # Sa-Token配置
@@ -157,5 +132,32 @@ sa-token:
  jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
  # token 前缀
  token-prefix: Bearer
-  is-read-cookie: false
-  is-read-body: false
+  sso:
+    # Ticket有效期 (单位: 秒)，默认五分钟
+    ticket-timeout: 300
+    # 所有允许的授权回调地址
+    allow-url: "*"
+    # 是否打开单点注销功能
+    is-slo: true
+
+    # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
+    # 是否打开模式三
+    isHttp: true
+    # 接口调用秘钥（用于SSO模式三的单点注销功能）
+    secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+    # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
+  is-read-cookie: true
+  is-print: false
+  #  未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
+  token-session-check-login: false
+  alone-redis:
+    # Redis数据库索引（默认为0）
+    database: 2
+    # Redis服务器地址
+    host: 127.0.0.1
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password:
+    # 连接超时时间
+    timeout: 10s