From f2631e786cc1c939e0a0698eadee76fd3d9a1fa9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 10 一月 2025 16:39:41 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 02c7732..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")
@@ -669,7 +672,6 @@
}
boolean first = true;
- long startTime = System.currentTimeMillis();
for (Segment segment : segmentList) {
// 鍒嗘鎵�灞炵殑Task
@@ -968,7 +970,6 @@
}
}
- System.out.println("save data: " + (System.currentTimeMillis() - startTime));
// finish
actionList.add(new Action(
@@ -987,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);
@@ -1021,7 +1023,7 @@
}
}
- log.info(agvNo + "鍙稟gv鍔ㄤ綔缁勮瀹屾垚锛屾寚浠ゆ暟閲忥細" + newActionList.size());
+ log.info("{}鍙稟gv鍔ㄤ綔缁勮瀹屾垚锛屾寚浠ゆ暟閲忥細{}", agvNo, newActionList.size());
} catch (Exception e) {
log.error("mainService.generateAction", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
--
Gitblit v1.9.1