From fa565c2d9dd77f4d5ccea1a8fb56feb1b864e2a7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 09 一月 2025 13:20:17 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index b1652e5..6dd57dd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -31,6 +31,7 @@
 import com.zy.acs.manager.manager.enums.*;
 import com.zy.acs.manager.manager.service.*;
 import com.zy.acs.manager.manager.service.impl.WebsocketServiceImpl;
+import com.zy.acs.manager.manager.utils.ActionSorter;
 import com.zy.acs.manager.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,6 +94,8 @@
     private AgvModelService agvModelService;
     @Autowired
     private LaneService laneService;
+    @Autowired
+    private ActionSorter actionSorter;
 
 
     @SuppressWarnings("all")
@@ -985,11 +988,12 @@
                     now    // 宸ヤ綔鏃堕棿
             ));
 
-            List<Action> newActionList = new ArrayList<>(actionList);
+//            List<Action> newActionList = new ArrayList<>(actionList);
 
 //            List<Action> optimizeList = actionService.optimizeSort(actionList);
 
-//            List<Action> newActionList = new ArrayList<>(optimizeList);
+            List<Action> optimizeList = actionSorter.optimizeSort(actionList);
+            List<Action> newActionList = new ArrayList<>(optimizeList);
 
 
             String groupId = String.valueOf(snowflakeIdWorker.nextId()).substring(3);

--
Gitblit v1.9.1