From 7272158c8e133afcdf752ca09a70c0bd969d7393 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 25 三月 2026 19:57:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 65 ++++++++++++--------------------
1 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 48749d6..631f97a 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -795,38 +795,48 @@
if (taskNo == null || taskNo <= 0 || stationId == null) {
return RerouteExecutionResult.skip("invalid-station-task");
}
+ boolean runBlockReroute = context.sceneType() == RerouteSceneType.RUN_BLOCK_REROUTE;
+ if (runBlockReroute) {
+ if (context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
+ stationMoveCoordinator.cancelSession(taskNo);
+ }
+ if (context.resetSegmentCommandsBeforeDispatch()) {
+ resetSegmentMoveCommandsBeforeReroute(taskNo);
+ }
+ }
if (context.checkRecentDispatch()
&& shouldSkipIdleRecoverForRecentDispatch(taskNo, stationId)) {
return RerouteExecutionResult.skip("recent-dispatch");
}
- if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), taskNo) > 0) {
+ int currentTaskBufferCommandCount = countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), taskNo);
+ if (currentTaskBufferCommandCount > 0 && !runBlockReroute) {
if (context.sceneType() == RerouteSceneType.IDLE_RECOVER) {
News.info("杈撻�佺珯鐐逛换鍔″仠鐣欒秴鏃讹紝浣嗙紦瀛樺尯浠嶅瓨鍦ㄥ綋鍓嶄换鍔″懡浠わ紝宸茶烦杩囬噸绠椼�傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽綋鍓嶄换鍔″懡浠ゆ暟={}",
stationId,
taskNo,
- countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), taskNo));
+ currentTaskBufferCommandCount);
}
return RerouteExecutionResult.skip("buffer-has-current-task");
}
- if (context.checkSuppressDispatch()
+ if (currentTaskBufferCommandCount > 0 && runBlockReroute) {
+ News.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸瑙勫垝妫�娴嬪埌鏃у垎娈靛懡浠ゆ畫鐣欙紝宸插厛娓呯悊鏈湴鐘舵�佸悗缁х画閲嶅彂銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽綋鍓嶄换鍔″懡浠ゆ暟={}",
+ stationId,
+ taskNo,
+ currentTaskBufferCommandCount);
+ }
+ if (!runBlockReroute
+ && context.checkSuppressDispatch()
&& stationMoveCoordinator != null
&& stationMoveCoordinator.shouldSuppressDispatch(taskNo, stationId, plan.command())) {
return RerouteExecutionResult.skip("dispatch-suppressed");
- }
- if (context.sceneType() == RerouteSceneType.RUN_BLOCK_REROUTE
- && shouldSkipRunBlockRerouteForExistingSession(taskNo, stationId, plan.command())) {
- News.info("杈撻�佺珯鐐瑰牭濉為噸瑙勫垝鍛戒腑宸茬敓鏁堝悓璺緞璺嚎锛屽凡璺宠繃閲嶅涓嬪彂銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岀洰鏍囩珯={}",
- stationId,
- taskNo,
- plan.command().getTargetStaNo());
- return RerouteExecutionResult.skip("run-block-same-path");
}
if (context.requireOutOrderDispatchLock()
&& !tryAcquireOutOrderDispatchLock(taskNo, stationId)) {
return RerouteExecutionResult.skip("out-order-lock");
}
- if (context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
+ if (!runBlockReroute
+ && context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
stationMoveCoordinator.cancelSession(taskNo);
}
if (!isBlank(context.executionLockKey())) {
@@ -836,7 +846,7 @@
}
redisUtil.set(context.executionLockKey(), "lock", context.executionLockSeconds());
}
- if (context.resetSegmentCommandsBeforeDispatch()) {
+ if (!runBlockReroute && context.resetSegmentCommandsBeforeDispatch()) {
resetSegmentMoveCommandsBeforeReroute(taskNo);
}
@@ -1391,40 +1401,13 @@
if (session == null) {
return false;
}
- boolean protectedStatus = session.isActive() || StationMoveSession.STATUS_BLOCKED.equals(session.getStatus());
- if (!protectedStatus || !session.containsStation(stationId)) {
+ if (!session.isActive() || !session.containsStation(stationId)) {
return false;
}
if (StationMoveDispatchMode.CIRCLE == session.getDispatchMode()) {
return true;
}
return !Objects.equals(stationId, session.getCurrentRouteTargetStationId());
- }
-
- private boolean shouldSkipRunBlockRerouteForExistingSession(Integer wrkNo,
- Integer stationId,
- StationCommand candidateCommand) {
- if (stationMoveCoordinator == null
- || wrkNo == null || wrkNo <= 0
- || stationId == null
- || candidateCommand == 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) {
- return false;
- }
- boolean sameDispatchStation = Objects.equals(stationId, session.getCurrentStationId())
- || Objects.equals(stationId, session.getDispatchStationId());
- if (!sameDispatchStation) {
- return false;
- }
- String candidateSignature = stationMoveCoordinator.buildPathSignature(candidateCommand);
- return !isBlank(candidateSignature) && Objects.equals(candidateSignature, session.getPathSignature());
}
private boolean isWatchingCircleArrival(Integer wrkNo, Integer stationId) {
--
Gitblit v1.9.1