From a72c3844450381a872e4f0f149210e480679984a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 三月 2026 16:57:24 +0800
Subject: [PATCH] refactor: unify station out-order reroute flow
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 824 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 761 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index f988dd1..a75648a 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -19,6 +19,8 @@
import com.zy.common.service.CommonService;
import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.RedisUtil;
+import com.zy.core.move.StationMoveCoordinator;
+import com.zy.core.move.StationMoveSession;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
@@ -27,6 +29,7 @@
import com.zy.core.model.Task;
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.model.protocol.StationTaskBufferItem;
import com.zy.core.service.StationTaskLoopService;
import com.zy.core.thread.StationThread;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +41,9 @@
public class StationOperateProcessUtils {
private static final int LOOP_LOAD_RESERVE_EXPIRE_SECONDS = 120;
private static final int OUT_ORDER_DISPATCH_LIMIT_SECONDS = 2;
+ private static final int STATION_COMMAND_DISPATCH_DEDUP_SECONDS = 10;
private static final int STATION_IDLE_RECOVER_SECONDS = 10;
- private static final int STATION_IDLE_RECOVER_LIMIT_SECONDS = 10;
+ private static final int STATION_IDLE_RECOVER_LIMIT_SECONDS = 30;
private static final int STATION_IDLE_TRACK_EXPIRE_SECONDS = 60 * 60;
private static final long STATION_MOVE_RESET_WAIT_MS = 1000L;
private static final String IDLE_RECOVER_CLEARED_MEMO = "idleRecoverRerouteCleared";
@@ -72,6 +76,8 @@
private StationTaskLoopService stationTaskLoopService;
@Autowired
private WrkAnalysisService wrkAnalysisService;
+ @Autowired
+ private StationMoveCoordinator stationMoveCoordinator;
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
public synchronized void stationInExecute() {
@@ -156,7 +162,7 @@
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
wrkAnalysisService.markInboundStationStart(wrkMast, now);
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "stationInExecute");
News.info("杈撻�佺珯鐐瑰叆搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationId, wrkMast.getWrkNo(), JSON.toJSONString(command));
redisUtil.set(RedisKeyType.STATION_IN_EXECUTE_LIMIT.key + stationId, "lock", 5);
loadGuardState.reserveLoopTask(loopHitResult.getLoopNo());
@@ -250,7 +256,16 @@
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
wrkAnalysisService.markOutboundStationStart(wrkMast, now);
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ boolean offered = offerDevpCommandWithDedup(stationObjModel.getDeviceNo(), command, "crnStationOutExecute");
+ if (offered && stationMoveCoordinator != null) {
+ stationMoveCoordinator.recordDispatch(
+ wrkMast.getWrkNo(),
+ stationProtocol.getStationId(),
+ "crnStationOutExecute",
+ command,
+ false
+ );
+ }
News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
redisUtil.del(RedisKeyType.CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo());
@@ -318,7 +333,7 @@
wrkMast.setSystemMsg("");
wrkMast.setIoTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
+ offerDevpCommandWithDedup(stationObjModel.getDeviceNo(), command, "dualCrnStationOutExecute");
notifyUtils.notify(String.valueOf(SlaveType.Devp), stationObjModel.getDeviceNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.STATION_OUT_TASK_RUN, null);
News.info("杈撻�佺珯鐐瑰嚭搴撳懡浠や笅鍙戞垚鍔燂紝绔欑偣鍙�={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
@@ -370,6 +385,9 @@
if (wrkMast == null || wrkMast.getWrkNo() == null) {
return;
}
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.finishSession(wrkMast.getWrkNo());
+ }
Date now = new Date();
wrkMast.setWrkSts(WrkStsType.STATION_RUN_COMPLETE.sts);
wrkMast.setIoTime(now);
@@ -417,6 +435,9 @@
}
if (complete) {
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.finishSession(wrkNo);
+ }
wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
wrkMast.setIoTime(new Date());
wrkMastService.updateById(wrkMast);
@@ -464,6 +485,20 @@
if (wrkMast.getIoType() == WrkIoType.IN.id && runBlockReassignLocStationList.contains(stationProtocol.getStationId())) {
//绔欑偣澶勪簬閲嶆柊鍒嗛厤搴撲綅鍖哄煙
+ int currentTaskBufferCommandCount = countCurrentTaskBufferCommands(
+ stationProtocol.getTaskBufferItems(),
+ stationProtocol.getTaskNo()
+ );
+ if (currentTaskBufferCommandCount > 0) {
+ News.info("杈撻�佺珯鐐硅繍琛屽牭濉為噸鍒嗛厤宸茶烦杩囷紝缂撳瓨鍖轰粛瀛樺湪褰撳墠浠诲姟鍛戒护銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽綋鍓嶄换鍔″懡浠ゆ暟={}",
+ stationProtocol.getStationId(),
+ stationProtocol.getTaskNo(),
+ currentTaskBufferCommandCount);
+ continue;
+ }
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.cancelSession(wrkMast.getWrkNo());
+ }
//杩愯鍫靛锛岄噸鏂扮敵璇蜂换鍔�
String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo(), stationProtocol.getStationId());
if (Cools.isEmpty(response)) {
@@ -541,7 +576,19 @@
}
if (wrkMastService.updateById(wrkMast)) {
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ boolean offered = offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "checkStationRunBlock_direct");
+ if (!offered) {
+ continue;
+ }
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.recordDispatch(
+ wrkMast.getWrkNo(),
+ stationProtocol.getStationId(),
+ "checkStationRunBlock_direct",
+ command,
+ false
+ );
+ }
}
} else {
News.error("璇锋眰WMS鎺ュ彛澶辫触锛侊紒锛乺esponse锛歿}", response);
@@ -560,6 +607,10 @@
continue;
}
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), stationProtocol.getTaskNo()) > 0) {
+ continue;
+ }
+
StationCommand command = stationThread.getRunBlockRerouteCommand(
wrkMast.getWrkNo(),
stationProtocol.getStationId(),
@@ -575,8 +626,24 @@
continue;
}
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.cancelSession(wrkMast.getWrkNo());
+ }
+ resetSegmentMoveCommandsBeforeReroute(wrkMast.getWrkNo());
+ boolean offered = offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "checkStationRunBlock_reroute");
+ if (!offered) {
+ continue;
+ }
syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderStationIds, dispatchDecision, command);
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.recordDispatch(
+ wrkMast.getWrkNo(),
+ stationProtocol.getStationId(),
+ "checkStationRunBlock_reroute",
+ command,
+ dispatchDecision != null && dispatchDecision.isCircle()
+ );
+ }
News.info("杈撻�佺珯鐐瑰牭濉炲悗閲嶆柊璁＄畻璺緞鍛戒护涓嬪彂鎴愬姛锛岀珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
}
}
@@ -675,39 +742,21 @@
continue;
}
- if (isWatchingCircleArrival(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
- continue;
- }
-
Double pathLenFactor = resolveOutboundPathLenFactor(wrkMast);
- OutOrderDispatchDecision dispatchDecision = resolveOutboundDispatchDecision(
- stationProtocol.getStationId(),
+ RerouteContext context = RerouteContext.create(
+ RerouteSceneType.OUT_ORDER,
+ basDevp,
+ stationThread,
+ stationProtocol,
wrkMast,
outOrderStationIds,
- pathLenFactor
- );
- Integer moveStaNo = dispatchDecision == null ? null : dispatchDecision.getTargetStationId();
- if (moveStaNo == null || Objects.equals(moveStaNo, stationProtocol.getStationId())) {
- continue;
- }
-
- StationCommand command = buildOutboundMoveCommand(
- stationThread,
- wrkMast,
- stationProtocol.getStationId(),
- moveStaNo,
- pathLenFactor
- );
- if (command == null) {
- News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
- continue;
- }
- if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
- continue;
- }
- syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderStationIds, dispatchDecision, command);
- MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
- News.info(dispatchDecision.isCircle() ? "{}浠诲姟杩涜缁曞湀" : "{}浠诲姟鐩存帴鍘荤洰鏍囩偣", wrkMast.getWrkNo());
+ pathLenFactor,
+ "checkStationOutOrder"
+ ).withDispatchDeviceNo(stationObjModel.getDeviceNo())
+ .withSuppressDispatchGuard()
+ .withOutOrderDispatchLock()
+ .withResetSegmentCommandsBeforeDispatch();
+ executeSharedReroute(context);
}
}
}
@@ -754,35 +803,20 @@
if (Objects.equals(stationProtocol.getStationId(), wrkMast.getStaNo())) {
continue;
}
-
Double pathLenFactor = resolveOutboundPathLenFactor(wrkMast);
- OutOrderDispatchDecision dispatchDecision = resolveOutboundDispatchDecision(
- stationProtocol.getStationId(),
+ RerouteContext context = RerouteContext.create(
+ RerouteSceneType.WATCH_CIRCLE,
+ basDevp,
+ stationThread,
+ stationProtocol,
wrkMast,
outOrderList,
- pathLenFactor
- );
- Integer moveStaNo = dispatchDecision == null ? null : dispatchDecision.getTargetStationId();
- if (moveStaNo == null || Objects.equals(moveStaNo, stationProtocol.getStationId())) {
- continue;
- }
-
- StationCommand command = buildOutboundMoveCommand(
- stationThread,
- wrkMast,
- stationProtocol.getStationId(),
- moveStaNo,
- pathLenFactor
- );
- if (command == null) {
- News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
- continue;
- }
- if (!tryAcquireOutOrderDispatchLock(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
- continue;
- }
- syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderList, dispatchDecision, command);
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ pathLenFactor,
+ "watchCircleStation"
+ ).withSuppressDispatchGuard()
+ .withOutOrderDispatchLock()
+ .withResetSegmentCommandsBeforeDispatch();
+ executeSharedReroute(context);
}
}
}
@@ -803,6 +837,197 @@
0,
normalizePathLenFactor(pathLenFactor)
);
+ }
+
+ RerouteCommandPlan buildRerouteCommandPlan(RerouteContext context,
+ RerouteDecision decision) {
+ if (context == null) {
+ return RerouteCommandPlan.skip("missing-context");
+ }
+ if (decision == null) {
+ return RerouteCommandPlan.skip("missing-decision");
+ }
+ if (decision.skip()) {
+ return RerouteCommandPlan.skip(decision.skipReason());
+ }
+ if (context.stationThread() == null || context.stationProtocol() == null || context.wrkMast() == null) {
+ return RerouteCommandPlan.skip("missing-runtime-dependency");
+ }
+ Integer currentStationId = context.stationProtocol().getStationId();
+ Integer targetStationId = decision.targetStationId();
+ if (currentStationId == null || targetStationId == null) {
+ return RerouteCommandPlan.skip("missing-target-station");
+ }
+ if (Objects.equals(currentStationId, targetStationId)) {
+ return RerouteCommandPlan.skip("same-station");
+ }
+
+ StationCommand command = context.useRunBlockCommand()
+ ? context.stationThread().getRunBlockRerouteCommand(
+ context.wrkMast().getWrkNo(),
+ currentStationId,
+ targetStationId,
+ 0,
+ context.pathLenFactor()
+ )
+ : buildOutboundMoveCommand(
+ context.stationThread(),
+ context.wrkMast(),
+ currentStationId,
+ targetStationId,
+ context.pathLenFactor()
+ );
+ if (command == null) {
+ return RerouteCommandPlan.skip("missing-command");
+ }
+ return RerouteCommandPlan.dispatch(command, decision, context.dispatchScene());
+ }
+
+ RerouteExecutionResult executeReroutePlan(RerouteContext context,
+ RerouteCommandPlan plan) {
+ if (context == null) {
+ return RerouteExecutionResult.skip("missing-context");
+ }
+ if (plan == null) {
+ return RerouteExecutionResult.skip("missing-plan");
+ }
+ if (plan.skip()) {
+ return RerouteExecutionResult.skip(plan.skipReason());
+ }
+ StationProtocol stationProtocol = context.stationProtocol();
+ if (stationProtocol == null) {
+ return RerouteExecutionResult.skip("missing-station-protocol");
+ }
+ Integer taskNo = stationProtocol.getTaskNo();
+ Integer stationId = stationProtocol.getStationId();
+ if (taskNo == null || taskNo <= 0 || stationId == null) {
+ return RerouteExecutionResult.skip("invalid-station-task");
+ }
+ if (context.checkRecentDispatch()
+ && shouldSkipIdleRecoverForRecentDispatch(taskNo, stationId)) {
+ return RerouteExecutionResult.skip("recent-dispatch");
+ }
+ if (countCurrentTaskBufferCommands(stationProtocol.getTaskBufferItems(), taskNo) > 0) {
+ return RerouteExecutionResult.skip("buffer-has-current-task");
+ }
+ if (context.checkSuppressDispatch()
+ && stationMoveCoordinator != null
+ && stationMoveCoordinator.shouldSuppressDispatch(taskNo, stationId, plan.command())) {
+ return RerouteExecutionResult.skip("dispatch-suppressed");
+ }
+ if (context.requireOutOrderDispatchLock()
+ && !tryAcquireOutOrderDispatchLock(taskNo, stationId)) {
+ return RerouteExecutionResult.skip("out-order-lock");
+ }
+
+ if (context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
+ stationMoveCoordinator.cancelSession(taskNo);
+ }
+ if (!isBlank(context.executionLockKey())) {
+ Object lock = redisUtil.get(context.executionLockKey());
+ if (lock != null) {
+ return RerouteExecutionResult.skip("scene-lock");
+ }
+ redisUtil.set(context.executionLockKey(), "lock", context.executionLockSeconds());
+ }
+ if (context.resetSegmentCommandsBeforeDispatch()) {
+ resetSegmentMoveCommandsBeforeReroute(taskNo);
+ }
+
+ int clearedCommandCount = 0;
+ if (context.clearIdleIssuedCommands()) {
+ clearedCommandCount = clearIssuedMoveCommandsDuringIdleStay(context.idleTrack(), taskNo, stationId);
+ }
+
+ boolean offered = offerDevpCommandWithDedup(context.dispatchDeviceNo(), plan.command(), plan.dispatchScene());
+ if (!offered) {
+ return RerouteExecutionResult.skip("dispatch-dedup");
+ }
+
+ applyRerouteDispatchEffects(context, plan, clearedCommandCount);
+ return RerouteExecutionResult.dispatched(plan.command(), clearedCommandCount);
+ }
+
+ RerouteDecision resolveSharedRerouteDecision(RerouteContext context) {
+ if (context == null || context.wrkMast() == null || context.stationProtocol() == null) {
+ return RerouteDecision.skip("missing-runtime-dependency");
+ }
+ Integer currentStationId = context.stationProtocol().getStationId();
+ if (currentStationId == null) {
+ return RerouteDecision.skip("missing-current-station");
+ }
+
+ if (context.sceneType() == RerouteSceneType.IDLE_RECOVER
+ && !Objects.equals(context.wrkMast().getWrkSts(), WrkStsType.STATION_RUN.sts)) {
+ Integer targetStationId = context.wrkMast().getStaNo();
+ return targetStationId == null || Objects.equals(targetStationId, currentStationId)
+ ? RerouteDecision.skip("same-station")
+ : RerouteDecision.proceed(targetStationId);
+ }
+
+ OutOrderDispatchDecision dispatchDecision = resolveOutboundDispatchDecision(
+ currentStationId,
+ context.wrkMast(),
+ context.outOrderStationIds(),
+ context.pathLenFactor()
+ );
+ Integer targetStationId = dispatchDecision == null ? null : dispatchDecision.getTargetStationId();
+ if (targetStationId == null || Objects.equals(targetStationId, currentStationId)) {
+ return RerouteDecision.skip("same-station");
+ }
+ return RerouteDecision.proceed(targetStationId, dispatchDecision);
+ }
+
+ private RerouteExecutionResult executeSharedReroute(RerouteContext context) {
+ RerouteDecision decision = resolveSharedRerouteDecision(context);
+ if (decision.skip()) {
+ return RerouteExecutionResult.skip(decision.skipReason());
+ }
+ RerouteCommandPlan plan = buildRerouteCommandPlan(context, decision);
+ return executeReroutePlan(context, plan);
+ }
+
+ private void applyRerouteDispatchEffects(RerouteContext context,
+ RerouteCommandPlan plan,
+ int clearedCommandCount) {
+ if (context == null || plan == null || plan.command() == null || context.wrkMast() == null || context.stationProtocol() == null) {
+ return;
+ }
+ WrkMast wrkMast = context.wrkMast();
+ StationProtocol stationProtocol = context.stationProtocol();
+ OutOrderDispatchDecision dispatchDecision = plan.decision() == null ? null : plan.decision().dispatchDecision();
+
+ syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), context.outOrderStationIds(), dispatchDecision, plan.command());
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.recordDispatch(
+ wrkMast.getWrkNo(),
+ stationProtocol.getStationId(),
+ plan.dispatchScene(),
+ plan.command(),
+ dispatchDecision != null && dispatchDecision.isCircle()
+ );
+ }
+ if (context.sceneType() == RerouteSceneType.IDLE_RECOVER) {
+ saveStationTaskIdleTrack(new StationTaskIdleTrack(wrkMast.getWrkNo(), stationProtocol.getStationId(), System.currentTimeMillis()));
+ News.info("杈撻�佺珯鐐逛换鍔″仠鐣檣}绉掓湭杩愯锛屽凡閲嶆柊璁＄畻璺緞骞堕噸鍚繍琛岋紝绔欑偣鍙�={}锛岀洰鏍囩珯={}锛屽伐浣滃彿={}锛屾竻鐞嗘棫鍒嗘鍛戒护鏁�={}锛屽懡浠ゆ暟鎹�={}",
+ STATION_IDLE_RECOVER_SECONDS,
+ stationProtocol.getStationId(),
+ plan.command().getTargetStaNo(),
+ wrkMast.getWrkNo(),
+ clearedCommandCount,
+ JSON.toJSONString(plan.command()));
+ return;
+ }
+ if (context.sceneType() == RerouteSceneType.RUN_BLOCK_REROUTE) {
+ News.info("杈撻�佺珯鐐瑰牭濉炲悗閲嶆柊璁＄畻璺緞鍛戒护涓嬪彂鎴愬姛锛岀珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽懡浠ゆ暟鎹�={}",
+ stationProtocol.getStationId(),
+ wrkMast.getWrkNo(),
+ JSON.toJSONString(plan.command()));
+ return;
+ }
+ if (context.sceneType() == RerouteSceneType.OUT_ORDER) {
+ News.info(dispatchDecision != null && dispatchDecision.isCircle() ? "{}浠诲姟杩涜缁曞湀" : "{}浠诲姟鐩存帴鍘荤洰鏍囩偣", wrkMast.getWrkNo());
+ }
}
private List<NavigateNode> calcOutboundNavigatePath(WrkMast wrkMast,
@@ -1253,8 +1478,39 @@
}
private boolean isWatchingCircleArrival(Integer wrkNo, Integer stationId) {
+ if (stationMoveCoordinator != null) {
+ StationMoveSession session = stationMoveCoordinator.loadSession(wrkNo);
+ if (session != null && session.isActive() && stationId != null) {
+ if (stationId.equals(session.getNextDecisionStationId())) {
+ return true;
+ }
+ if (session.containsStation(stationId)) {
+ return false;
+ }
+ }
+ }
StationCommand command = getWatchCircleCommand(wrkNo);
return command != null && stationId != null && stationId.equals(command.getTargetStaNo());
+ }
+
+ private boolean isWatchingCircleTransit(Integer wrkNo, Integer stationId) {
+ if (stationMoveCoordinator != null) {
+ StationMoveSession session = stationMoveCoordinator.loadSession(wrkNo);
+ if (session != null && session.isActive() && stationId != null) {
+ if (stationId.equals(session.getNextDecisionStationId())) {
+ return false;
+ }
+ if (session.containsStation(stationId)) {
+ return true;
+ }
+ }
+ }
+ StationCommand command = getWatchCircleCommand(wrkNo);
+ if (command == null || stationId == null || Objects.equals(stationId, command.getTargetStaNo())) {
+ return false;
+ }
+ List<Integer> navigatePath = command.getNavigatePath();
+ return navigatePath != null && navigatePath.contains(stationId);
}
private StationCommand getWatchCircleCommand(Integer wrkNo) {
@@ -1299,6 +1555,9 @@
}
StationTaskIdleTrack idleTrack = touchStationTaskIdleTrack(stationProtocol.getTaskNo(), stationProtocol.getStationId());
+ if (shouldSkipIdleRecoverForRecentDispatch(stationProtocol.getTaskNo(), stationProtocol.getStationId())) {
+ return;
+ }
if (idleTrack == null || !idleTrack.isTimeout(STATION_IDLE_RECOVER_SECONDS)) {
return;
}
@@ -1310,6 +1569,17 @@
Object lock = redisUtil.get(RedisKeyType.CHECK_STATION_IDLE_RECOVER_LIMIT_.key + stationProtocol.getTaskNo());
if (lock != null) {
+ return;
+ }
+ int currentTaskBufferCommandCount = countCurrentTaskBufferCommands(
+ stationProtocol.getTaskBufferItems(),
+ stationProtocol.getTaskNo()
+ );
+ if (currentTaskBufferCommandCount > 0) {
+ News.info("杈撻�佺珯鐐逛换鍔″仠鐣欒秴鏃讹紝浣嗙紦瀛樺尯浠嶅瓨鍦ㄥ綋鍓嶄换鍔″懡浠わ紝宸茶烦杩囬噸绠椼�傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛屽綋鍓嶄换鍔″懡浠ゆ暟={}",
+ stationProtocol.getStationId(),
+ stationProtocol.getTaskNo(),
+ currentTaskBufferCommandCount);
return;
}
@@ -1326,6 +1596,9 @@
return;
}
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.cancelSession(stationProtocol.getTaskNo());
+ }
redisUtil.set(RedisKeyType.CHECK_STATION_IDLE_RECOVER_LIMIT_.key + stationProtocol.getTaskNo(), "lock", STATION_IDLE_RECOVER_LIMIT_SECONDS);
resetSegmentMoveCommandsBeforeReroute(stationProtocol.getTaskNo());
int clearedCommandCount = clearIssuedMoveCommandsDuringIdleStay(idleTrack, stationProtocol.getTaskNo(), stationProtocol.getStationId());
@@ -1342,8 +1615,20 @@
return;
}
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ boolean offered = offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "checkStationIdleRecover");
+ if (!offered) {
+ return;
+ }
syncOutOrderWatchState(wrkMast, stationProtocol.getStationId(), outOrderList, dispatchDecision, command);
+ if (stationMoveCoordinator != null) {
+ stationMoveCoordinator.recordDispatch(
+ wrkMast.getWrkNo(),
+ stationProtocol.getStationId(),
+ "checkStationIdleRecover",
+ command,
+ dispatchDecision != null && dispatchDecision.isCircle()
+ );
+ }
saveStationTaskIdleTrack(new StationTaskIdleTrack(wrkMast.getWrkNo(), stationProtocol.getStationId(), System.currentTimeMillis()));
News.info("杈撻�佺珯鐐逛换鍔″仠鐣檣}绉掓湭杩愯锛屽凡閲嶆柊璁＄畻璺緞骞堕噸鍚繍琛岋紝绔欑偣鍙�={}锛岀洰鏍囩珯={}锛屽伐浣滃彿={}锛屾竻鐞嗘棫鍒嗘鍛戒护鏁�={}锛屽懡浠ゆ暟鎹�={}",
STATION_IDLE_RECOVER_SECONDS, stationProtocol.getStationId(), moveStaNo, wrkMast.getWrkNo(), clearedCommandCount, JSON.toJSONString(command));
@@ -1360,6 +1645,29 @@
|| Objects.equals(wrkMast.getWrkSts(), WrkStsType.STATION_RUN.sts);
}
+ private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
+ if (stationMoveCoordinator == null || taskNo == null || taskNo <= 0 || stationId == null) {
+ return false;
+ }
+ StationMoveSession session = stationMoveCoordinator.loadSession(taskNo);
+ if (session == null || !session.isActive() || session.getLastIssuedAt() == null) {
+ return false;
+ }
+ if (!Objects.equals(stationId, session.getCurrentStationId())
+ && !Objects.equals(stationId, session.getDispatchStationId())) {
+ return false;
+ }
+ long elapsedMs = System.currentTimeMillis() - session.getLastIssuedAt();
+ long thresholdMs = STATION_IDLE_RECOVER_SECONDS * 1000L;
+ if (elapsedMs >= thresholdMs) {
+ return false;
+ }
+ saveStationTaskIdleTrack(new StationTaskIdleTrack(taskNo, stationId, System.currentTimeMillis()));
+ News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛涓婃涓嬪彂={}ms锛宺outeVersion={}",
+ stationId, taskNo, elapsedMs, session.getRouteVersion());
+ return true;
+ }
+
private void resetSegmentMoveCommandsBeforeReroute(Integer taskNo) {
if (redisUtil == null || taskNo == null || taskNo <= 0) {
return;
@@ -1373,6 +1681,69 @@
} catch (Exception ignore) {
}
redisUtil.del(key);
+ }
+
+ private int countCurrentTaskBufferCommands(List<StationTaskBufferItem> taskBufferItems, Integer currentTaskNo) {
+ if (taskBufferItems == null || taskBufferItems.isEmpty() || currentTaskNo == null || currentTaskNo <= 0) {
+ return 0;
+ }
+ int count = 0;
+ for (StationTaskBufferItem item : taskBufferItems) {
+ if (item == null || item.getTaskNo() == null) {
+ continue;
+ }
+ if (currentTaskNo.equals(item.getTaskNo())) {
+ count++;
+ }
+ }
+ return count;
+ }
+
+ private boolean offerDevpCommandWithDedup(Integer deviceNo, StationCommand command, String scene) {
+ if (deviceNo == null || command == null) {
+ return false;
+ }
+ String dedupKey = buildStationCommandDispatchDedupKey(deviceNo, command);
+ if (redisUtil != null) {
+ Object lock = redisUtil.get(dedupKey);
+ if (lock != null) {
+ News.info("杈撻�佺珯鐐瑰懡浠ょ煭鏃堕噸澶嶆淳鍙戯紝宸茶烦杩囥�俿cene={}锛宒eviceNo={}锛宼askNo={}锛宻tationId={}锛宼argetStaNo={}锛宑ommandType={}",
+ scene,
+ deviceNo,
+ command.getTaskNo(),
+ command.getStationId(),
+ command.getTargetStaNo(),
+ command.getCommandType());
+ return false;
+ }
+ redisUtil.set(dedupKey, "lock", STATION_COMMAND_DISPATCH_DEDUP_SECONDS);
+ }
+ boolean offered = MessageQueue.offer(SlaveType.Devp, deviceNo, new Task(2, command));
+ if (!offered && redisUtil != null) {
+ redisUtil.del(dedupKey);
+ }
+ return offered;
+ }
+
+ private String buildStationCommandDispatchDedupKey(Integer deviceNo, StationCommand command) {
+ return RedisKeyType.STATION_COMMAND_DISPATCH_DEDUP_.key
+ + deviceNo + "_"
+ + command.getTaskNo() + "_"
+ + command.getStationId() + "_"
+ + (stationMoveCoordinator == null ? Integer.toHexString(buildFallbackPathSignature(command).hashCode())
+ : stationMoveCoordinator.buildPathSignatureHash(command));
+ }
+
+ private String buildFallbackPathSignature(StationCommand command) {
+ if (command == null) {
+ return "";
+ }
+ return String.valueOf(command.getCommandType())
+ + "_" + command.getStationId()
+ + "_" + command.getTargetStaNo()
+ + "_" + command.getNavigatePath()
+ + "_" + command.getLiftTransferPath()
+ + "_" + command.getOriginalNavigatePath();
}
private int clearIssuedMoveCommandsDuringIdleStay(StationTaskIdleTrack idleTrack,
@@ -1690,6 +2061,333 @@
return pathLenFactor;
}
+ enum RerouteSceneType {
+ RUN_BLOCK_REROUTE,
+ IDLE_RECOVER,
+ OUT_ORDER,
+ WATCH_CIRCLE
+ }
+
+ static final class RerouteDecision {
+ private final boolean skip;
+ private final String skipReason;
+ private final Integer targetStationId;
+ private final OutOrderDispatchDecision dispatchDecision;
+
+ private RerouteDecision(boolean skip,
+ String skipReason,
+ Integer targetStationId,
+ OutOrderDispatchDecision dispatchDecision) {
+ this.skip = skip;
+ this.skipReason = skipReason;
+ this.targetStationId = targetStationId;
+ this.dispatchDecision = dispatchDecision;
+ }
+
+ static RerouteDecision skip(String reason) {
+ return new RerouteDecision(true, reason, null, null);
+ }
+
+ static RerouteDecision proceed(Integer targetStationId) {
+ return new RerouteDecision(false, null, targetStationId, null);
+ }
+
+ static RerouteDecision proceed(Integer targetStationId,
+ OutOrderDispatchDecision dispatchDecision) {
+ return new RerouteDecision(false, null, targetStationId, dispatchDecision);
+ }
+
+ boolean skip() {
+ return skip;
+ }
+
+ String skipReason() {
+ return skipReason;
+ }
+
+ Integer targetStationId() {
+ return targetStationId;
+ }
+
+ OutOrderDispatchDecision dispatchDecision() {
+ return dispatchDecision;
+ }
+ }
+
+ static final class RerouteContext {
+ private final RerouteSceneType sceneType;
+ private final BasDevp basDevp;
+ private final StationThread stationThread;
+ private final StationProtocol stationProtocol;
+ private final WrkMast wrkMast;
+ private final List<Integer> outOrderStationIds;
+ private final Double pathLenFactor;
+ private final String dispatchScene;
+ private Integer dispatchDeviceNo;
+ private boolean useRunBlockCommand;
+ private boolean checkSuppressDispatch;
+ private boolean requireOutOrderDispatchLock;
+ private boolean cancelSessionBeforeDispatch;
+ private boolean resetSegmentCommandsBeforeDispatch;
+ private boolean clearIdleIssuedCommands;
+ private boolean checkRecentDispatch;
+ private String executionLockKey;
+ private int executionLockSeconds;
+ private StationTaskIdleTrack idleTrack;
+
+ private RerouteContext(RerouteSceneType sceneType,
+ BasDevp basDevp,
+ StationThread stationThread,
+ StationProtocol stationProtocol,
+ WrkMast wrkMast,
+ List<Integer> outOrderStationIds,
+ Double pathLenFactor,
+ String dispatchScene) {
+ this.sceneType = sceneType;
+ this.basDevp = basDevp;
+ this.stationThread = stationThread;
+ this.stationProtocol = stationProtocol;
+ this.wrkMast = wrkMast;
+ this.outOrderStationIds = outOrderStationIds == null ? Collections.emptyList() : outOrderStationIds;
+ this.pathLenFactor = pathLenFactor;
+ this.dispatchScene = dispatchScene;
+ this.dispatchDeviceNo = basDevp == null ? null : basDevp.getDevpNo();
+ }
+
+ static RerouteContext create(RerouteSceneType sceneType,
+ BasDevp basDevp,
+ StationThread stationThread,
+ StationProtocol stationProtocol,
+ WrkMast wrkMast,
+ List<Integer> outOrderStationIds,
+ Double pathLenFactor,
+ String dispatchScene) {
+ return new RerouteContext(sceneType, basDevp, stationThread, stationProtocol, wrkMast, outOrderStationIds, pathLenFactor, dispatchScene);
+ }
+
+ RerouteContext withDispatchDeviceNo(Integer dispatchDeviceNo) {
+ this.dispatchDeviceNo = dispatchDeviceNo;
+ return this;
+ }
+
+ RerouteContext withRunBlockCommand() {
+ this.useRunBlockCommand = true;
+ return this;
+ }
+
+ RerouteContext withSuppressDispatchGuard() {
+ this.checkSuppressDispatch = true;
+ return this;
+ }
+
+ RerouteContext withOutOrderDispatchLock() {
+ this.requireOutOrderDispatchLock = true;
+ return this;
+ }
+
+ RerouteContext withCancelSessionBeforeDispatch() {
+ this.cancelSessionBeforeDispatch = true;
+ return this;
+ }
+
+ RerouteContext withResetSegmentCommandsBeforeDispatch() {
+ this.resetSegmentCommandsBeforeDispatch = true;
+ return this;
+ }
+
+ RerouteContext clearIdleIssuedCommands(StationTaskIdleTrack idleTrack) {
+ this.clearIdleIssuedCommands = true;
+ this.idleTrack = idleTrack;
+ return this;
+ }
+
+ RerouteContext withRecentDispatchGuard() {
+ this.checkRecentDispatch = true;
+ return this;
+ }
+
+ RerouteContext withExecutionLock(String executionLockKey, int executionLockSeconds) {
+ this.executionLockKey = executionLockKey;
+ this.executionLockSeconds = executionLockSeconds;
+ return this;
+ }
+
+ RerouteSceneType sceneType() {
+ return sceneType;
+ }
+
+ BasDevp basDevp() {
+ return basDevp;
+ }
+
+ StationThread stationThread() {
+ return stationThread;
+ }
+
+ StationProtocol stationProtocol() {
+ return stationProtocol;
+ }
+
+ WrkMast wrkMast() {
+ return wrkMast;
+ }
+
+ List<Integer> outOrderStationIds() {
+ return outOrderStationIds;
+ }
+
+ Double pathLenFactor() {
+ return pathLenFactor;
+ }
+
+ String dispatchScene() {
+ return dispatchScene;
+ }
+
+ Integer dispatchDeviceNo() {
+ return dispatchDeviceNo;
+ }
+
+ boolean useRunBlockCommand() {
+ return useRunBlockCommand;
+ }
+
+ boolean checkSuppressDispatch() {
+ return checkSuppressDispatch;
+ }
+
+ boolean requireOutOrderDispatchLock() {
+ return requireOutOrderDispatchLock;
+ }
+
+ boolean cancelSessionBeforeDispatch() {
+ return cancelSessionBeforeDispatch;
+ }
+
+ boolean resetSegmentCommandsBeforeDispatch() {
+ return resetSegmentCommandsBeforeDispatch;
+ }
+
+ boolean clearIdleIssuedCommands() {
+ return clearIdleIssuedCommands;
+ }
+
+ boolean checkRecentDispatch() {
+ return checkRecentDispatch;
+ }
+
+ String executionLockKey() {
+ return executionLockKey;
+ }
+
+ int executionLockSeconds() {
+ return executionLockSeconds;
+ }
+
+ StationTaskIdleTrack idleTrack() {
+ return idleTrack;
+ }
+ }
+
+ static final class RerouteCommandPlan {
+ private final boolean skip;
+ private final String skipReason;
+ private final StationCommand command;
+ private final RerouteDecision decision;
+ private final String dispatchScene;
+
+ private RerouteCommandPlan(boolean skip,
+ String skipReason,
+ StationCommand command,
+ RerouteDecision decision,
+ String dispatchScene) {
+ this.skip = skip;
+ this.skipReason = skipReason;
+ this.command = command;
+ this.decision = decision;
+ this.dispatchScene = dispatchScene;
+ }
+
+ static RerouteCommandPlan skip(String reason) {
+ return new RerouteCommandPlan(true, reason, null, null, null);
+ }
+
+ static RerouteCommandPlan dispatch(StationCommand command,
+ RerouteDecision decision,
+ String dispatchScene) {
+ return new RerouteCommandPlan(false, null, command, decision, dispatchScene);
+ }
+
+ boolean skip() {
+ return skip;
+ }
+
+ String skipReason() {
+ return skipReason;
+ }
+
+ StationCommand command() {
+ return command;
+ }
+
+ RerouteDecision decision() {
+ return decision;
+ }
+
+ String dispatchScene() {
+ return dispatchScene;
+ }
+ }
+
+ static final class RerouteExecutionResult {
+ private final boolean skipped;
+ private final String skipReason;
+ private final boolean dispatched;
+ private final StationCommand command;
+ private final int clearedCommandCount;
+
+ private RerouteExecutionResult(boolean skipped,
+ String skipReason,
+ boolean dispatched,
+ StationCommand command,
+ int clearedCommandCount) {
+ this.skipped = skipped;
+ this.skipReason = skipReason;
+ this.dispatched = dispatched;
+ this.command = command;
+ this.clearedCommandCount = clearedCommandCount;
+ }
+
+ static RerouteExecutionResult skip(String reason) {
+ return new RerouteExecutionResult(true, reason, false, null, 0);
+ }
+
+ static RerouteExecutionResult dispatched(StationCommand command,
+ int clearedCommandCount) {
+ return new RerouteExecutionResult(false, null, true, command, clearedCommandCount);
+ }
+
+ boolean skipped() {
+ return skipped;
+ }
+
+ String skipReason() {
+ return skipReason;
+ }
+
+ boolean dispatched() {
+ return dispatched;
+ }
+
+ StationCommand command() {
+ return command;
+ }
+
+ int clearedCommandCount() {
+ return clearedCommandCount;
+ }
+ }
+
private static class OutOrderDispatchDecision {
private final Integer targetStationId;
private final boolean circle;
--
Gitblit v1.9.1