From 4d45de01e35f8b271e5ba25439b574a8b67bc5eb Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 14:00:55 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
index 775f301..8de616a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java
@@ -96,7 +96,6 @@
Travel travel = travelService.getById(segment.getTravelId());
Agv agv = agvService.getById(travel.getAgvId());
- AgvDetail agvDetail = agvDetailService.selectByAgvId(travel.getAgvId());
long endNode = segment.getEndNode();
// valid ----------------------------------------------------
@@ -208,9 +207,9 @@
}
// checkout path
- Code startCode = codeService.getCacheById(agvDetail.getRecentCode());
+ Code startCode = agvDetailService.getCurrentCode(travel.getAgvId());
Code endCode = codeService.getCacheById(endNode);
- long startTime = System.currentTimeMillis();
+// long startTime = System.currentTimeMillis();
List<String> pathList = this.checkoutPath(agv, startCode, endCode, segment);
// System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime));
if (Cools.isEmpty(pathList)) {
@@ -277,7 +276,7 @@
mapService.lockPath(null, pathList, agv.getUuid());
- startTime = System.currentTimeMillis();
+// startTime = System.currentTimeMillis();
mainService.generateAction(segment.getAgvId(), segmentList, pathList, now);
// System.out.println("generateAction: " + (System.currentTimeMillis() - startTime));
@@ -491,6 +490,7 @@
// deal expired jam
for (Jam expiredJam : jamService.list(new LambdaQueryWrapper<Jam>()
.eq(Jam::getJamAgv, agv.getId())
+ .ne(Jam::getCycleAvo, 1)
.eq(Jam::getState, JamStateType.RUNNING.toString()))) {
expiredJam.setEndTime(now);
expiredJam.setUpdateTime(now);
--
Gitblit v1.9.1