root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:增加取货完成信号校验，任务添加队列日志记录

Browse Source
This commit is contained in:
gongbaoxiong
2024-07-21 18:18:39 +08:00
parent bf5ec5c605
commit 1923c5303a
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -687,6 +687,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
//保存任务子卷号 //保存任务子卷号
SchBaseTask taskDto = zxqTask.createTaskReturnTask(jo); SchBaseTask taskDto = zxqTask.createTaskReturnTask(jo);
task.setTask_id(taskDto.getTask_id()); task.setTask_id(taskDto.getTask_id());
task.setTask_code(taskDto.getTask_code());
task.setVehicle_code(taskDto.getVehicle_code()); task.setVehicle_code(taskDto.getVehicle_code());
//增加任务到队列 //增加任务到队列
schBaseTaskList.add(task); schBaseTaskList.add(task);

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java
View File

@@ -104,9 +104,11 @@ public class DjqTask extends AbstractAcsTask {
log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------"); log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
//1.校验agv任务取货完成信号 //1.校验agv任务取货完成信号
if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) { if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
//agv取货完成信号未发送 if (!schBaseTask.getRequest_param().equals("98") && !schBaseTask.getRequest_param().equals("99")) {
if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) { //agv取货完成信号未发送
log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！！！"); if (!schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.TASK_ACTION_TYPE.code("取货完成"))) {
log.info(schBaseTask.getTask_code() + "检查检查->满轴位-待检区，agv取货完成信号未发送！！！");
}
} }
} else { } else {
//agv取货完成信号未发送 //agv取货完成信号未发送

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/TaskQueue.java
View File

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -38,7 +39,11 @@ public class TaskQueue {
* 添加任务 * 添加任务
*/ */
public void addTasksToQueue(String groupId, List<SchBaseTask> tasks) { 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() + "成功添加到任务队列。");
});
} }
/** /**

14
lms/nladmin-system/src/main/java/org/nl/modules/common/utils/RedisUtils.java
View File

@@ -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);
}
}
/** /**
* 获取队列元素个数 * 获取队列元素个数
*/ */