From 1923c5303a694fe79bb1803c6bc43f946e7fb925 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Sun, 21 Jul 2024 18:18:39 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=A2=9E=E5=8A=A0=E5=8F=96=E8=B4=A7?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BF=A1=E5=8F=B7=E6=A0=A1=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B7=BB=E5=8A=A0=E9=98=9F=E5=88=97=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PdmBiSubpackagerelationServiceImpl.java   |  1 +
 .../b_lms/sch/tasks/first_floor_area/DjqTask.java  |  8 +++++---
 .../sch/tasks/first_floor_area/auto/TaskQueue.java |  7 ++++++-
 .../org/nl/modules/common/utils/RedisUtils.java    | 14 ++++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 8542c416a..54b45a1c0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -687,6 +687,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                         //保存任务子卷号
                         SchBaseTask taskDto = zxqTask.createTaskReturnTask(jo);
                         task.setTask_id(taskDto.getTask_id());
+                        task.setTask_code(taskDto.getTask_code());
                         task.setVehicle_code(taskDto.getVehicle_code());
                         //增加任务到队列
                         schBaseTaskList.add(task);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
index 694f6c1c1..0e9db40a6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
@@ -104,9 +104,11 @@ public class DjqTask extends AbstractAcsTask {
             log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
             //1.校验agv任务取货完成信号
             if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
-                //agv取货完成信号未发送
-                if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
-                    log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！！！");
+                if (!schBaseTask.getRequest_param().equals("98") && !schBaseTask.getRequest_param().equals("99")) {
+                    //agv取货完成信号未发送
+                    if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
+                        log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！！！");
+                    }
                 }
             } else {
                 //agv取货完成信号未发送
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
index 43f3937f7..39b663fe5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @RequiredArgsConstructor
@@ -38,7 +39,11 @@ public class TaskQueue {
      * 添加任务
      */
     public void addTasksToQueue(String groupId, List<SchBaseTask> tasks) {
-        tasks.forEach(task -> redisUtils.pushToList(TASK_QUEUE_PREFIX + groupId, task));
+        tasks.forEach(task -> {
+            redisUtils.pushToList(TASK_QUEUE_PREFIX + groupId, task);
+            //redisUtils.pushToList(TASK_QUEUE_PREFIX + groupId, task,3,TimeUnit.HOURS);
+            log.info("待检区->装箱区agv任务组为:" + groupId + ",任务编号为：" + task.getTask_code() + "成功添加到任务队列。");
+        });
     }
 
     /**
diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java
index 14e2465c3..1be4ab70b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java
+++ b/lms/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java
@@ -744,6 +744,20 @@ public class RedisUtils {
     }
 
 
+
+    // 队列新增并设置过期时间
+    public void pushToList(String key, Object value, long timeout, TimeUnit unit) {
+        try {
+            String valueJson = objectMapper.writeValueAsString(value);
+            redisTemplate.opsForList().rightPush(key, valueJson);
+            redisTemplate.expire(key, timeout, unit);
+        } catch (JsonProcessingException e) {
+            log.error("序列化对象出错:", e);
+        }
+    }
+
+
+
     /**
      * 获取队列元素个数
      */