From 95a193eef12a217076be6ba280190b3104daf967 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 20 三月 2026 20:42:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 37 +------------------------------------
1 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 152b125..7f91b77 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -1250,42 +1250,7 @@
StationTrafficSnapshot trafficSnapshot,
LoopMergeGuardContext loopMergeGuardContext,
Set<LoopMergeEntry> mandatoryLoopMergeEntrySet) {
- if (path == null || path.size() < 2 || loopMergeGuardContext == null || loopMergeGuardContext.loopStationIdSet.isEmpty()) {
- return true;
- }
-
- List<Integer> stationIdList = extractStationIdList(path);
- if (stationIdList.size() < 2) {
- return true;
- }
-
- for (int i = 1; i < stationIdList.size(); i++) {
- Integer prevStationId = stationIdList.get(i - 1);
- Integer currentStationId = stationIdList.get(i);
- if (prevStationId == null || currentStationId == null) {
- continue;
- }
- if (loopMergeGuardContext.loopStationIdSet.contains(prevStationId)
- || !loopMergeGuardContext.loopStationIdSet.contains(currentStationId)) {
- continue;
- }
-
- Set<Integer> trunkNeighborSet = loopMergeGuardContext.loopNeighborMap.getOrDefault(currentStationId, Collections.emptySet());
- if (trunkNeighborSet.size() < 2) {
- continue;
- }
-
- LoopMergeEntry currentEntry = new LoopMergeEntry(prevStationId, currentStationId);
- for (Integer trunkNeighborStationId : trunkNeighborSet) {
- if (isStationOccupiedForLoopMerge(trunkNeighborStationId, statusMap, trafficSnapshot)) {
- return false;
- }
- }
- boolean mandatoryEntry = mandatoryLoopMergeEntrySet != null && mandatoryLoopMergeEntrySet.contains(currentEntry);
- if (!mandatoryEntry && !isLoopTrunkVeryIdle(currentStationId, loopMergeGuardContext, statusMap, trafficSnapshot)) {
- return false;
- }
- }
+ // 鐜嚎骞跺叆淇濇姢宸插仠鐢細鍏佽鍊欓�夎矾寰勭洿鎺ュ弬涓庡悗缁瘎鍒嗐��
return true;
}
--
Gitblit v1.9.1