From 072bc2934f3a9b65ef7a95140fb74a972e802a14 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 1 Sep 2025 16:39:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?opt:=20=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=80=E7=BB=84=E4=B8=80=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch_manage/service/util/AbstractTask.java | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

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<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参数
         List<AcsTaskDto> taskDtoList = new ArrayList<>();
-        for (SchBaseTask taskDao : taskList) {
+        for (SchBaseTask taskDao : nextTasks) {
             AcsTaskDto acsTaskDto = this.sendAcsParam(taskDao.getTask_id());
             taskDtoList.add(acsTaskDto);
         }

From 55e721cd3ed2cb9d0bb2bf15254365ae81122c90 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Mon, 1 Sep 2025 16:41:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?opt:=20=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nlsso-server/src/main/resources/logback-spring.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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