From 13ea8b334572c2423abb8d156fd8428f8d074172 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 08:24:58 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficZkdService.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficZkdService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficZkdService.java
index 861f248..b592454 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficZkdService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficZkdService.java
@@ -76,30 +76,36 @@
}
// ---------------------------
- Travel travel = travelService.getById(segment.getTravelId());
- Agv agv = agvService.getById(travel.getAgvId());
- AgvDetail agvDetail = agvDetailService.selectByAgvId(travel.getAgvId());
- long endNode = segment.getEndNode();
+// Travel travel = travelService.getById(segment.getTravelId());
+// Agv agv = agvService.getById(travel.getAgvId());
+// AgvDetail agvDetail = agvDetailService.selectByAgvId(travel.getAgvId());
+// long endNode = segment.getEndNode();
- if (!Cools.isEmpty(segmentService.getByAgvAndState(agv.getId(), SegmentStateType.RUNNING.toString()))) {
- return;
- }
- List<Segment> waitingSegList = segmentService.getByAgvAndState(agv.getId(), SegmentStateType.WAITING.toString());
- if (!Cools.isEmpty(waitingSegList)) {
- for (Segment waitingSeg : waitingSegList) {
- if (!waitingSeg.getId().equals(segment.getId())) {
-// log.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
- return;
- }
- }
- }
+// if (!Cools.isEmpty(segmentService.getByAgvAndState(agv.getId(), SegmentStateType.RUNNING.toString()))) {
+// return;
+// }
+// List<Segment> waitingSegList = segmentService.getByAgvAndState(agv.getId(), SegmentStateType.WAITING.toString());
+// if (!Cools.isEmpty(waitingSegList)) {
+// for (Segment waitingSeg : waitingSegList) {
+// if (!waitingSeg.getId().equals(segment.getId())) {
+//// log.error("AGV[{}] 浠诲姟寮傚父锛屾湇鍔″櫒閿欒锛侊紒锛�", agv.getUuid());
+// return;
+// }
+// }
+// }
List<Segment> segmentList = new ArrayList<>();
segmentList.add(segment);
-
- mainZkdService.generateAction(segment.getAgvId(), segmentList, null, now);
+ List<String> pathList = new ArrayList<>();
+ String[] split = segment.getPath().split(",");
+ for (int i = 0; i < split.length; i++) {
+ if (!Cools.isEmpty(split[i])) {
+ pathList.add(split[i]);
+ }
+ }
+ mainZkdService.generateAction(segment.getAgvId(), segmentList, pathList, now);
} catch (Exception e) {
log.error("TrafficService.trigger", e);
--
Gitblit v1.9.1