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满轴位-待检区,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 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); + } + } + + + /** * 获取队列元素个数 */