diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 427aaa5..0b806a9 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -72,7 +72,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java index 48b1b75..007e03a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java @@ -20,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -76,9 +78,27 @@ public abstract class AbstractTask { if (ObjectUtil.isEmpty(taskList)) { return; } + List runningTask = taskService.list(new LambdaQueryWrapper() + .eq(SchBaseTask::getIs_delete, IOSConstant.IS_DELETE_NO) + .in(SchBaseTask::getTask_status, Arrays.asList(TaskStatus.ISSUED.getCode() + , TaskStatus.EXECUTING.getCode()))); + List distinctRunningTasks = new ArrayList<>(runningTask.stream() + .collect(Collectors.toMap( + SchBaseTask::getTask_group_id, + Function.identity(), + (existing, replacement) -> existing + )) + .values()); + if (distinctRunningTasks.size() < 2) { + return; + } + // 获取一组下发 + SchBaseTask task = taskList.get(0); + List nextTasks = taskList.stream() + .filter(p -> p.getTask_group_id().equals(task.getTask_group_id())).collect(Collectors.toList()); // 整理下发acs参数 List taskDtoList = new ArrayList<>(); - for (SchBaseTask taskDao : taskList) { + for (SchBaseTask taskDao : nextTasks) { AcsTaskDto acsTaskDto = this.sendAcsParam(taskDao.getTask_id()); taskDtoList.add(acsTaskDto); }