From d16ca22c1e673d632a9186a88a69aac1524c8ae2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 25 三月 2026 17:49:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index c54062f..a081481 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -20,6 +20,7 @@
import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.move.StationMoveCoordinator;
+import com.zy.core.move.StationMoveDispatchMode;
import com.zy.core.move.StationMoveSession;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
@@ -595,6 +596,9 @@
continue;
}
if (Objects.equals(stationProtocol.getStationId(), wrkMast.getStaNo())) {
+ continue;
+ }
+ if (shouldSkipOutOrderDispatchForExistingRoute(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
@@ -1352,6 +1356,24 @@
return true;
}
+ private boolean shouldSkipOutOrderDispatchForExistingRoute(Integer wrkNo, Integer stationId) {
+ if (stationMoveCoordinator == null || wrkNo == null || wrkNo <= 0 || stationId == null) {
+ return false;
+ }
+ StationMoveSession session = stationMoveCoordinator.loadSession(wrkNo);
+ if (session == null) {
+ return false;
+ }
+ boolean protectedStatus = session.isActive() || StationMoveSession.STATUS_BLOCKED.equals(session.getStatus());
+ if (!protectedStatus || !session.containsStation(stationId)) {
+ return false;
+ }
+ if (StationMoveDispatchMode.CIRCLE == session.getDispatchMode()) {
+ return true;
+ }
+ return !Objects.equals(stationId, session.getCurrentRouteTargetStationId());
+ }
+
private boolean isWatchingCircleArrival(Integer wrkNo, Integer stationId) {
if (stationMoveCoordinator != null) {
StationMoveSession session = stationMoveCoordinator.loadSession(wrkNo);
--
Gitblit v1.9.1