From 4937f052ec2c91b3fdcbb669aef7991912cde98e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 31 十二月 2025 10:48:28 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TrafficService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 8de616a..02e8e03 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
@@ -264,8 +264,11 @@
interrupt = true;
} else {
if (nextStep.getEndNode() == endNode) {
-
- segmentList.add(nextStep);
+ // remove sta action seg
+ if (!nextStep.getPosType().equals(TaskPosDto.PosType.ORI_STA.toString())
+ && !nextStep.getPosType().equals(TaskPosDto.PosType.DEST_STA.toString())) {
+ segmentList.add(nextStep);
+ }
} else {
interrupt = true;
}
@@ -697,6 +700,10 @@
if (!Cools.isEmpty(jamService.getUnfinishedAvoSegByAvo(blockVehicleDto.getVehicle(), null))) {
continue;
}
+ // 褰撳墠vehicle姝ｅ湪杩涜婊氱瓛杈撻�佺嚎绛夊緟
+ if () {
+ continue;
+ }
return blockVehicleDto.getVehicle();
}
return null;
--
Gitblit v1.9.1