From 8e492faebda1640adfc30a780fc95b9ecd019c6d Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 10:34:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 0d5d835..a2a0f9f 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
@@ -133,11 +133,11 @@
}
// checkout path
- Code startCode = codeService.getById(agvDetail.getRecentCode());
- Code endCode = codeService.getById(endNode);
+ Code startCode = codeService.getCacheById(agvDetail.getRecentCode());
+ Code endCode = codeService.getCacheById(endNode);
long startTime = System.currentTimeMillis();
List<String> pathList = this.checkoutPath(agv, startCode, endCode, segment);
- System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime));
+// System.out.println("checkoutPath: " + (System.currentTimeMillis() - startTime));
if (Cools.isEmpty(pathList)) {
return;
}
@@ -204,7 +204,7 @@
startTime = System.currentTimeMillis();
mainService.generateAction(segment.getAgvId(), segmentList, pathList, now);
- System.out.println("generateAction: " + (System.currentTimeMillis() - startTime));
+// System.out.println("generateAction: " + (System.currentTimeMillis() - startTime));
} catch (Exception e) {
log.error("TrafficService.trigger", e);
@@ -309,7 +309,7 @@
// block vehicle info
Long blockAgvId = agvService.getAgvId(blockAgvNo);
- String blockAgvCode = codeService.getById(agvDetailService.selectByAgvId(blockAgvId).getRecentCode()).getData();
+ String blockAgvCode = codeService.getCacheById(agvDetailService.selectMajorByAgvId(blockAgvId).getRecentCode()).getData();
// create new jam if already notify the avoid vehicle
if (!Cools.isEmpty(jam.getAvoAgv(), jam.getAvoSeg()) && !blockAgvId.equals(jam.getAvoAgv())) {
@@ -477,8 +477,8 @@
* avoidPathList include wave node and dynamic node
*/
private boolean notifyVehicleAvoid(String agvNo, String agvPosCode, List<String> avoidPathList, String sponsor, Jam jam) {
- Agv agv = agvService.selectByUuid(agvNo);
- if (!Cools.isEmpty(segmentService.getByAgvAndState(agv.getId(), SegmentStateType.RUNNING.toString()))) {
+ Long agvId = agvService.getAgvId(agvNo);
+ if (!Cools.isEmpty(segmentService.getByAgvAndState(agvId, SegmentStateType.RUNNING.toString()))) {
log.warn("{}鍙疯溅杈嗛伩璁╁け璐ワ紝瀛樺湪杩涜涓换鍔★紒锛侊紒", agvNo);
return false;
}
@@ -496,7 +496,7 @@
String endCodeData = finalNode.getCodeData();
Code endCode = codeService.getCacheByData(endCodeData);
- List<Segment> waitingSegList = segmentService.getByAgvAndState(agv.getId(), SegmentStateType.WAITING.toString());
+ List<Segment> waitingSegList = segmentService.getByAgvAndState(agvId, SegmentStateType.WAITING.toString());
if (!Cools.isEmpty(waitingSegList)) {
if (waitingSegList.size() > 1) {
@@ -517,7 +517,7 @@
Segment insertSeg = new Segment();
insertSeg.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
insertSeg.setTravelId(segment.getTravelId());
- insertSeg.setAgvId(agv.getId());
+ insertSeg.setAgvId(agvId);
insertSeg.setTaskId(segment.getTaskId());
insertSeg.setSerial(segment.getSerial() - 1);
insertSeg.setEndNode(endCode.getId());
@@ -533,7 +533,7 @@
} else {
- return mainLockWrapService.buildMinorTask(agv, TaskTypeType.MOVE, endCodeData, jam);
+ return mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, endCodeData, jam);
}
return true;
--
Gitblit v1.9.1