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

Merge branch 'master' of http://121.40.234.130:7788/lyd/zhuzhouzhongwu

Browse Source
This commit is contained in:
zhengxuming
2025-09-04 15:22:08 +08:00
parent d08c9d588c 55e721cd3e
commit 77a7d599ed
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
View File

@@ -72,7 +72,7 @@ https://juejin.cn/post/6844903775631572999
<!-- <appender-ref ref="asyncFileAppender"/>--> <!-- <appender-ref ref="asyncFileAppender"/>-->
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</root> </root>
<!-- <logger name="jdbc" level="ERROR" additivity="true"> <logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</logger> </logger>
<logger name="org.springframework" level="ERROR" additivity="true"> <logger name="org.springframework" level="ERROR" additivity="true">
@@ -95,7 +95,7 @@ https://juejin.cn/post/6844903775631572999
</logger> </logger>
<logger name="org.jinterop" level="ERROR" additivity="true"> <logger name="org.jinterop" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</logger>--> </logger>
</springProfile> </springProfile>
<!--测试环境:打印控制台--> <!--测试环境:打印控制台-->

22
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/AbstractTask.java
View File

@@ -20,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -76,9 +78,27 @@ public abstract class AbstractTask {
if (ObjectUtil.isEmpty(taskList)) { if (ObjectUtil.isEmpty(taskList)) {
return; return;
} }
List<SchBaseTask> runningTask = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getIs_delete, IOSConstant.IS_DELETE_NO)
.in(SchBaseTask::getTask_status, Arrays.asList(TaskStatus.ISSUED.getCode()
, TaskStatus.EXECUTING.getCode())));
List<SchBaseTask> 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<SchBaseTask> nextTasks = taskList.stream()
.filter(p -> p.getTask_group_id().equals(task.getTask_group_id())).collect(Collectors.toList());
// 整理下发acs参数 // 整理下发acs参数
List<AcsTaskDto> taskDtoList = new ArrayList<>(); List<AcsTaskDto> taskDtoList = new ArrayList<>();
for (SchBaseTask taskDao : taskList) { for (SchBaseTask taskDao : nextTasks) {
AcsTaskDto acsTaskDto = this.sendAcsParam(taskDao.getTask_id()); AcsTaskDto acsTaskDto = this.sendAcsParam(taskDao.getTask_id());
taskDtoList.add(acsTaskDto); taskDtoList.add(acsTaskDto);
} }