From f3b64d003bc3458af3dd434e6187d3aba23a64aa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 14:35:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 443 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 390 insertions(+), 53 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..71153a4 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -165,6 +165,7 @@
wrkAnalysisService.markInboundStationStart(wrkMast, now);
boolean offered = offerDevpCommandWithDedup(basDevp.getDevpNo(), command, "stationInExecute");
if (offered && stationMoveCoordinator != null) {
+ // 鍒濆鍏ュ簱鍛戒护涔熺撼鍏� session 璺熻釜锛屽悗缁仠鐣欐仮澶�/缁曞湀/鍫靛閲嶇畻鎵嶈兘鍩轰簬鍚屼竴鏉¤矾绾跨姸鎬佸垽鏂��
stationMoveCoordinator.recordDispatch(
wrkMast.getWrkNo(),
stationProtocol.getStationId(),
@@ -228,6 +229,8 @@
&& stationProtocol.isLoading()
&& stationProtocol.getTaskNo() == 0
) {
+ // 鍏堢畻褰撳墠浠诲姟鍦ㄦ壒娆″嚭搴撲腑鐨勮矾寰勫�惧悜绯绘暟锛屽啀甯︾潃杩欎釜绯绘暟鍘诲喅绛栫洰鏍囩珯锛�
+ // 杩欐牱鍚屼竴鎵规涓嶅悓搴忓彿浠诲姟鍦ㄦ帓搴忕偣銆佺粫鍦堢偣鍜屽牭濉為噸绠楁椂浼氬緱鍒颁竴鑷寸殑鐩爣瑁佸喅銆�
Double pathLenFactor = resolveOutboundPathLenFactor(wrkMast);
OutOrderDispatchDecision dispatchDecision = resolveOutboundDispatchDecision(
stationProtocol.getStationId(),
@@ -345,6 +348,7 @@
if (wrkMastService.updateById(wrkMast)) {
boolean offered = offerDevpCommandWithDedup(stationObjModel.getDeviceNo(), command, "dualCrnStationOutExecute");
if (offered && stationMoveCoordinator != null) {
+ // 鍙屽伐浣嶅爢鍨涙満杞叆杈撻�佺嚎鍚庡悓鏍疯鐧昏 session锛屽惁鍒欏悗缁噸绠楀彧鑳界湅鍒� PLC 鍛戒护锛岀湅涓嶅埌璺嚎璇箟銆�
stationMoveCoordinator.recordDispatch(
wrkMast.getWrkNo(),
stationProtocol.getStationId(),
@@ -508,6 +512,8 @@
}
Double pathLenFactor = resolveOutboundPathLenFactor(wrkMast);
+ // 杩愯鍫靛涓嶅崟鐙喅瀹氫笟鍔＄洰鏍囩珯锛屼粛鐒跺鐢ㄥ嚭搴撴帓搴�/缁曞湀鐨勭洰鏍囪鍐筹紝
+ // 杩欓噷鍙槸瑕佹眰鐢� run-block 涓撶敤绠楄矾锛屽苟鍦ㄩ噸鍙戝墠娓呮帀鏃� session/segment 鐘舵�併��
RerouteContext context = RerouteContext.create(
RerouteSceneType.RUN_BLOCK_REROUTE,
basDevp,
@@ -603,6 +609,7 @@
continue;
}
+ // 鎺掑簭鐐规湰韬凡缁忓牭濉炴椂锛屼笉鍦� out-order 閲屽仛浜屾鍐崇瓥锛岀粺涓�浜ょ粰 run-block 閲嶈鍒掑鐞嗐��
if (stationProtocol.isRunBlock()) {
continue;
}
@@ -621,6 +628,7 @@
if (Objects.equals(stationProtocol.getStationId(), wrkMast.getStaNo())) {
continue;
}
+ // 鍙湁娲诲姩涓殑鐜版湁璺嚎鎵嶄細鍘嬪埗 out-order锛汢LOCKED 璺嚎瑕佸厑璁告帓搴忕偣閲嶆柊鍚姩銆�
if (shouldSkipOutOrderDispatchForExistingRoute(wrkMast.getWrkNo(), stationProtocol.getStationId())) {
continue;
}
@@ -668,6 +676,7 @@
continue;
}
+ // 缁曞湀瑙﹀彂浼樺厛璇� session 鐨勪笅涓�鍐崇瓥绔欙紝legacy WATCH_CIRCLE key 鍙仛鍏煎鍥為��銆�
if (!isWatchingCircleArrival(stationProtocol.getTaskNo(), stationProtocol.getStationId())) {
continue;
}
@@ -795,38 +804,70 @@
if (taskNo == null || taskNo <= 0 || stationId == null) {
return RerouteExecutionResult.skip("invalid-station-task");
}
+ if (stationMoveCoordinator != null) {
+ return stationMoveCoordinator.withTaskDispatchLock(taskNo,
+ () -> executeReroutePlanWithTaskLock(context, plan, stationProtocol, taskNo, stationId));
+ }
+ return executeReroutePlanWithTaskLock(context, plan, stationProtocol, taskNo, stationId);
+ }
+
+ private RerouteExecutionResult executeReroutePlanWithTaskLock(RerouteContext context,
+ RerouteCommandPlan plan,
+ StationProtocol stationProtocol,
+ Integer taskNo,
+ Integer stationId) {
+ boolean runBlockReroute = context.sceneType() == RerouteSceneType.RUN_BLOCK_REROUTE;
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) {
+ // 鍫靛閲嶈鍒掕鏇挎崲鐨勬鏄繖浜涙棫鍒嗘鍛戒护锛屼笉鑳藉啀鎶婃畫鐣� buffer 褰撴垚鏂扮殑鎷︽埅鏉′欢銆�
+ 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");
- }
+ // 杩涘叆鍫靛閲嶈鍒掑悗锛屾棫璺嚎宸茬粡琚樉寮忓彇娑堬紝鏈疆鍛戒护涓嶅啀鍙備笌 active-session suppress 鍒ゅ畾銆�
if (context.requireOutOrderDispatchLock()
&& !tryAcquireOutOrderDispatchLock(taskNo, stationId)) {
return RerouteExecutionResult.skip("out-order-lock");
}
if (context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
+ // 鍒囪矾鍓嶅厛鎶婃棫 session 缃负 CANCEL_PENDING锛岃宸茬粡鎺掗槦涓殑鏃у垎娈电嚎绋嬪湪鏈�缁堝彂閫佸墠鍋滀笅銆�
+ stationMoveCoordinator.markCancelPending(taskNo, "reroute_pending");
+ }
+
+ if (runBlockReroute) {
+ // 绔欑偣杩涘叆鍫靛鍚庯紝璁惧渚у彲鑳藉凡缁忔妸涔嬪墠棰勪笅鍙戠殑鍒嗘鍛戒护娓呮帀浜嗐��
+ // 鍏堜綔搴熸湰鍦� session/segment 鐘舵�侊紝鍐嶆寜鏂拌矾绾块噸鍙戯紝閬垮厤琚棫鐘舵�佸弽鍚戝崱浣忋��
+ if (context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
+ stationMoveCoordinator.cancelSession(taskNo);
+ }
+ if (context.resetSegmentCommandsBeforeDispatch()) {
+ resetSegmentMoveCommandsBeforeReroute(taskNo);
+ }
+ }
+
+ if (!runBlockReroute
+ && context.cancelSessionBeforeDispatch() && stationMoveCoordinator != null) {
stationMoveCoordinator.cancelSession(taskNo);
}
if (!isBlank(context.executionLockKey())) {
@@ -836,7 +877,7 @@
}
redisUtil.set(context.executionLockKey(), "lock", context.executionLockSeconds());
}
- if (context.resetSegmentCommandsBeforeDispatch()) {
+ if (!runBlockReroute && context.resetSegmentCommandsBeforeDispatch()) {
resetSegmentMoveCommandsBeforeReroute(taskNo);
}
@@ -948,6 +989,31 @@
return navigateUtils.calcByStationId(sourceStationId, targetStationId, currentTaskNo, normalizedFactor);
}
+ /**
+ * 璁＄畻褰撳墠鍑哄簱浠诲姟鐨勮矾寰勫�惧悜绯绘暟銆�
+ *
+ * <p>杩欎釜绯绘暟涓嶆槸涓氬姟鐩爣绔欐湰韬紝鑰屾槸鈥滃湪澶氭潯鍙璺嚎涔嬮棿鏇村亸鍚戝摢涓�鏉♀�濈殑杈呭姪杈撳叆锛�
+ * 鐩殑鏄鍚屼竴鎵规銆佷笉鍚屽簭鍙风殑浠诲姟鍦ㄥ叡浜幆绾块噷灏介噺褰㈡垚绋冲畾銆佸彲閲嶅鐨勮矾寰勫垎甯冦��
+ *
+ * <p>杩斿洖鍊艰寖鍥村浐瀹氬湪 {@code [0, 1]}锛�
+ * 1. 闈炴壒娆″嚭搴撲换鍔★紝鐩存帴杩斿洖 {@code 0.0}锛岃〃绀轰笉寮曞叆棰濆璺緞鍋忕疆銆�
+ * 2. 褰撳墠鎵规鍙湁 1 涓湁鏁堟椿鍔ㄤ换鍔★紝杩斿洖 {@code 0.0}锛屽洜涓烘病鏈夆�滃墠鍚庨『搴忊�濆彲姣旇緝銆�
+ * 3. 鍚﹀垯鎸夆�滃綋鍓嶄换鍔″墠闈㈣繕鏈夊灏戜釜鏈夋晥鍓嶅簭浠诲姟鈥濆崰鈥滄湁鏁堟椿鍔ㄤ换鍔℃�绘暟鈥濈殑姣斾緥鏉ョ畻銆�
+ *
+ * <p>杩欓噷鐨勨�滄湁鏁堜换鍔♀�濆彧缁熻锛�
+ * 1. ioType=OUT 鐨勫嚭搴撲换鍔★紱
+ * 2. 浠嶅浜庢椿鍔ㄧ姸鎬侊紝鏈畬鎴�/鏈粨绠楋紱
+ * 3. 鏈� batchSeq锛�
+ * 4. mk != taskCancel銆�
+ *
+ * <p>缁撴灉鍚箟鍙互鐩磋鐞嗚В涓猴細
+ * 浠诲姟鎵规搴忓彿瓒婇潬鍚庯紝鍓嶉潰宸茬粡瀛樺湪鐨勬湁鏁堜换鍔¤秺澶氾紝寰楀埌鐨勭郴鏁拌秺澶э紱
+ * 鍚庣画绠楄矾鏃跺氨鏇村鏄撳拰鍓嶅簭浠诲姟褰㈡垚绋冲畾鐨勮矾寰勫垎娴侊紝鑰屼笉鏄墍鏈変换鍔￠兘璧板悓涓�鏉￠粯璁ょ煭璺��
+ *
+ * <p>娉ㄦ剰锛�
+ * 杩欎釜鏂规硶涓嶇洿鎺ュ喅瀹氱洰鏍囩珯锛屼笉璐熻矗鎺掑簭鏀捐锛屽彧鎻愪緵鈥滆矾寰勫亸濂解�濊緭鍏ャ��
+ * 鐪熸鐨勭洰鏍囩珯浠嶇敱 {@link #resolveOutboundDispatchDecision(Integer, WrkMast, List, Double)} 鍐冲畾銆�
+ */
private Double resolveOutboundPathLenFactor(WrkMast wrkMast) {
if (!isBatchOutboundTaskWithSeq(wrkMast)) {
return 0.0d;
@@ -974,6 +1040,12 @@
return normalizePathLenFactor((double) predecessorCount / (double) (activeTaskCount - 1));
}
+ /**
+ * 鍒ゆ柇褰撳墠浠诲姟鏄惁鍏峰鈥滄寜鎵规鍑哄簱瑙勫垯鍙備笌鎺掑簭/璺緞鍋忓ソ璁＄畻鈥濈殑鍩虹鏉′欢銆�
+ *
+ * <p>杩欓噷鍙仛鏈�鍩虹鐨勮祫鏍艰繃婊わ紝涓嶅叧蹇冨綋鍓嶆槸鍚︾湡鐨勯渶瑕佹帓搴忕偣浠嬪叆銆�
+ * 鍙涓嶆槸鎵规鍑哄簱浠诲姟锛屽悗闈㈢殑璺緞鍋忓ソ绯绘暟涓庢帓搴忕洰鏍囧喅绛栭兘搴旇鐩存帴閫�鍖栦负榛樿琛屼负銆�
+ */
private boolean isBatchOutboundTaskWithSeq(WrkMast wrkMast) {
return wrkMast != null
&& Objects.equals(wrkMast.getIoType(), WrkIoType.OUT.id)
@@ -982,6 +1054,15 @@
&& wrkMast.getWrkNo() != null;
}
+ /**
+ * 鍔犺浇鍚屼竴鎵规涓嬩粛澶勪簬娲诲姩涓殑鍑哄簱浠诲姟銆�
+ *
+ * <p>杩欓噷鐢ㄤ簬涓ょ被璁＄畻锛�
+ * 1. 璁＄畻璺緞鍋忓ソ绯绘暟鏃讹紝缁熻褰撳墠浠诲姟鍓嶉潰杩樻湁澶氬皯涓湁鏁堝墠搴忎换鍔°��
+ * 2. 褰撳墠鎺掑簭鐐归噸鏂板喅绛栨椂锛屾壘鍑鸿繖涓�鎵光�滈涓湭瀹屾垚浠诲姟鈥濈殑瀹為檯鎵规搴忓彿銆�
+ *
+ * <p>宸茬粡瀹屾垚/缁撶畻鐨勪换鍔′笉鍐嶅弬涓庡綋鍓嶆壒娆＄殑鎺掑簭涓庡亸濂借绠椼��
+ */
private List<WrkMast> loadActiveBatchTaskList(String batch) {
if (Cools.isEmpty(batch)) {
return Collections.emptyList();
@@ -995,6 +1076,12 @@
WrkStsType.SETTLE_OUTBOUND.sts));
}
+ /**
+ * 鍒ゆ柇鏌愭潯鎵规浠诲姟鏄惁搴旇璁″叆璺緞鍋忓ソ绯绘暟鐨勫垎姣�/鍒嗗瓙缁熻銆�
+ *
+ * <p>杩欓噷鎺掗櫎娌℃湁 batchSeq 鐨勪换鍔′互鍙婅鏄惧紡鏍囪涓� taskCancel 鐨勪换鍔★紝
+ * 閬垮厤鏃犳晥浠诲姟鎶婂悓鎵规鐨勮矾寰勫亸濂借绠楁媺鍋忋��
+ */
private boolean isFactorCandidateTask(WrkMast wrkMast) {
return wrkMast != null
&& Objects.equals(wrkMast.getIoType(), WrkIoType.OUT.id)
@@ -1012,6 +1099,44 @@
return list;
}
+ /**
+ * 缁熶竴璁＄畻褰撳墠浠诲姟鈥滄鍒诲簲璇ユ湞鍝釜鐩爣绔欑户缁繍琛屸�濄��
+ *
+ * <p>杩欐槸鍑哄簱鎺掑簭銆佺粫鍦堛�佸牭濉為噸瑙勫垝鍏辩敤鐨勭洰鏍囪鍐冲叆鍙ｃ��
+ * 涓嶇瑙﹀彂鏉ユ簮鏄� OUT_ORDER銆乄ATCH_CIRCLE 杩樻槸 RUN_BLOCK_REROUTE锛�
+ * 鍙涓氬姟璇箟杩樻槸鈥滃綋鍓嶈繖绁ㄥ嚭搴撲换鍔′笅涓�姝ヨ寰�鍝噷璧扳�濓紝閮戒粠杩欓噷寰楀嚭鐩爣绔欍��
+ *
+ * <p>瀹冨仛涓夊眰鍒ゆ柇锛�
+ * 1. 濡傛灉褰撳墠浠诲姟鏍规湰涓嶉�傜敤鍑哄簱鎺掑簭锛岀洿鎺ヨ繑鍥炰换鍔′笟鍔＄洰鏍囩珯 {@code wrkMast.staNo}銆�
+ * 2. 濡傛灉閫傜敤鍑哄簱鎺掑簭锛屽厛绠楀嚭鈥滃綋鍓嶆壒娆¤鍒欎笅锛屾鍒诲厑璁稿墠寰�鐨� dispatchStationId鈥濄��
+ * 3. 濡傛灉褰撳墠绔欑偣姝ｅソ灏辨槸鎺掑簭鍐崇瓥鐐癸紝鍐嶈繘涓�姝ュ垽鏂槸锛�
+ * 鐩存帴鍘荤洰鏍囩偣锛岃繕鏄厛杩涘叆缁曞湀鐩爣鐐癸紝鎴栬�呭洜涓轰弗鏍肩獥鍙ｉ檺鍒惰�屾殏涓嶆斁琛屻��
+ *
+ * <p>杩斿洖鐨� {@link OutOrderDispatchDecision} 涓嶅彧鏄竴涓洰鏍囩珯锛�
+ * 杩樻惡甯︿簡杩欐鍐崇瓥鏄惁灞炰簬缁曞湀銆佹槸鍚︽潵鑷綋鍓嶆帓搴忕偣閲嶆柊瑁佸喅绛夎涔変俊鎭紝
+ * 渚涘悗缁棩蹇椼�乻ession 璁板綍鍜� watch-circle 鍒ゅ畾浣跨敤銆�
+ *
+ * <p>鍙傛暟鍚箟锛�
+ * 1. {@code currentStationId}锛氫换鍔″綋鍓嶆墍鍦ㄧ珯鐐广�傜敤浜庡垽鏂綋鍓嶆槸涓嶆槸鎺掑簭鍐崇瓥鐐广��
+ * 褰撳墠鏄笉鏄凡缁忓埌杈� watch-circle 鐨勪笅涓�鍐崇瓥绔欍��
+ * 2. {@code wrkMast}锛氬綋鍓嶄换鍔′富鐘舵�侊紝鑷冲皯瑕佹彁渚涗笟鍔＄洰鏍囩珯銆佹潵婧愮珯銆佹壒娆°�佸簭鍙风瓑淇℃伅銆�
+ * 3. {@code outOrderStationIds}锛氬綋鍓嶈澶囬厤缃殑鎵�鏈夊嚭搴撴帓搴忕珯鐐瑰垪琛ㄣ��
+ * 4. {@code pathLenFactor}锛氱敱 {@link #resolveOutboundPathLenFactor(WrkMast)} 寰楀埌鐨勮矾寰勫亸濂界郴鏁帮紝
+ * 鐢ㄦ潵璁╁悓涓�鎵规浠诲姟鍦ㄩ�夋嫨 dispatch target 鏃朵繚鎸佺ǔ瀹氱殑璺緞鍊惧悜銆�
+ *
+ * <p>杩斿洖鍊艰涔夛細
+ * 1. 杩斿洖 {@code null}锛氬綋鍓嶆棤娉曞緱鍒板悎娉曠洰鏍囩珯锛岃皟鐢ㄦ柟搴旇烦杩囨湰娆℃淳鍙戙��
+ * 2. 杩斿洖 {@code targetStationId=wrkMast.staNo, circle=false}锛�
+ * 褰撳墠涓嶉渶瑕佸嚭搴撴帓搴忓共棰勶紝鎴栧凡鍏佽鐩存帴鍘讳笟鍔＄洰鏍囩珯銆�
+ * 3. 杩斿洖 {@code targetStationId!=wrkMast.staNo}锛�
+ * 褰撳墠搴旇鍏堝幓涓�涓腑闂� dispatch 鐩爣绔欙紝鍚庣画鍐嶇敱鎺掑簭鐐�/缁曞湀鐐圭户缁喅绛栥��
+ * 4. 杩斿洖 {@code circle=true}锛�
+ * 褰撳墠灞炰簬缁曞湀鍐崇瓥缁撴灉锛屽悗缁� watch-circle 閫昏緫浼氭嵁姝ゆ帴绠°��
+ *
+ * <p>娉ㄦ剰锛�
+ * 杩欎釜鏂规硶鍙喅瀹氣�滅洰鏍囩珯鈥濓紝涓嶇洿鎺ョ敓鎴愯緭閫佸懡浠ゃ��
+ * 鐪熸鐨勮矾寰勭敱鏅�氱畻璺垨 run-block 涓撶敤绠楄矾鍦ㄥ悗缁楠ょ敓鎴愩��
+ */
private OutOrderDispatchDecision resolveOutboundDispatchDecision(Integer currentStationId,
WrkMast wrkMast,
List<Integer> outOrderStationIds,
@@ -1043,6 +1168,24 @@
return new OutOrderDispatchDecision(dispatchStationId, false);
}
+ /**
+ * 鍦ㄢ�滃綋鍓嶇珯鐐瑰氨鏄湰娆℃帓搴忓喅绛栫偣鈥濇椂锛岃绠楄繖閲屽埌搴曡鐩存帴鏀捐杩樻槸杩涘叆缁曞湀銆�
+ *
+ * <p>杩欐槸鍑哄簱鎺掑簭閲屾渶鏍稿績鐨勫眬閮ㄥ喅绛栨柟娉曘�傝繘鍏ヨ繖閲屼箣鍓嶏紝宸茬粡婊¤冻锛�
+ * 1. 褰撳墠浠诲姟閫傜敤 out-order锛�
+ * 2. 褰撳墠绔欑偣灏辨槸杩欑エ浠诲姟姝ゅ埢瀵瑰簲鐨� dispatch 鎺掑簭鐐广��
+ *
+ * <p>鍐呴儴鍐崇瓥椤哄簭锛�
+ * 1. 鍏堝彇鍑哄悓鎵规浠嶆湭瀹屾垚鐨勪换鍔★紝鎵惧嚭杩欐壒褰撳墠鈥滃簲褰撹浼樺厛鏀捐鈥濈殑搴忓彿浣嶇疆銆�
+ * 2. 鍐嶇粨鍚堝綋鍓嶄换鍔″湪鍒濆璺緞涓婄殑鎺掑簭绐楀彛浣嶇疆锛屽垽鏂嚜宸辨鍒昏兘鍚︾洿鎺ュ幓涓氬姟鐩爣绔欍��
+ * 3. 濡傛灉鐞嗚涓婅鑷繁鏀捐锛岃繕瑕侀澶栨鏌ョ洰鏍囨柟鍚戜笂鏄惁瀛樺湪鍙繘鍏ョ殑 release slot銆�
+ * 4. 濡傛灉涓嶈兘鐩磋揪锛屾垨鑰呯洿杈炬柟鍚戝綋鍓嶅叏閮ㄩ樆濉烇紝灏辫浆鎴� circle 鍐崇瓥锛屽鎵句笅涓�鎺掑簭妫�娴嬬偣銆�
+ *
+ * <p>杩斿洖鍊硷細
+ * 1. {@code circle=false} 琛ㄧず褰撳墠鎺掑簭鐐瑰凡缁忓厑璁哥洿鎺ュ幓涓氬姟鐩爣绔欍��
+ * 2. {@code circle=true} 琛ㄧず褰撳墠鍙兘鍏堝幓涓嬩竴缁曞湀鐩爣绔欙紝鍚庣画鐢� watch-circle/鎺掑簭鐐圭户缁帴鍔涘喅绛栥��
+ * 3. {@code null} 琛ㄧず褰撳墠鏃笉鑳界洿杈撅紝涔熸病鎵惧埌鍚堟硶鐨勪笅涓�缁曞湀鐐癸紝璋冪敤鏂瑰簲璺宠繃鏈娲惧彂銆�
+ */
private OutOrderDispatchDecision resolveCurrentOutOrderDispatchDecision(Integer currentStationId,
WrkMast wrkMast,
List<Integer> outOrderStationIds,
@@ -1128,6 +1271,12 @@
return new OutOrderDispatchDecision(circleTarget, true, loopEvaluation, true);
}
+ /**
+ * 鍒ゆ柇杩欑エ浠诲姟鍦ㄥ綋鍓嶈澶囦笂鏄惁搴旇鍚敤鍑哄簱鎺掑簭閫昏緫銆�
+ *
+ * <p>鍙缂哄皯浠讳綍涓�涓帓搴忓墠鎻愶紝渚嬪涓嶆槸鍑哄簱浠诲姟銆佹病鏈夋壒娆°�佹病鏈夊簭鍙枫��
+ * 褰撳墠璁惧涔熸病鏈夐厤缃帓搴忕偣锛屽氨搴旇鐩存帴閫�鍥炩�滄櫘閫氱洰鏍囩珯鍐崇瓥鈥濄��
+ */
private boolean shouldApplyOutOrder(WrkMast wrkMast, List<Integer> outOrderStationIds) {
return wrkMast != null
&& wrkMast.getStaNo() != null
@@ -1138,6 +1287,13 @@
&& !outOrderStationIds.isEmpty();
}
+ /**
+ * 鍒ゆ柇褰撳墠鎵�鍦ㄧ珯鐐规槸鍚﹀氨鏄�滆繖绁ㄤ换鍔℃鍒诲簲璇ヨЕ鍙戞帓搴忓喅绛栫殑 dispatch 绔欑偣鈥濄��
+ *
+ * <p>娉ㄦ剰瀹冧笉鏄畝鍗曞垽鏂�滃綋鍓嶇珯鐐规槸鍚﹀睘浜庢帓搴忕偣鍒楄〃鈥濓紝
+ * 鑰屾槸鍏堟牴鎹畬鏁磋矾寰勫弽鎺ㄥ嚭褰撳墠浠诲姟瀵瑰簲鐨� dispatch 鎺掑簭鐐癸紝
+ * 鍐嶅垽鏂綋鍓嶄綅缃槸鍚︽濂界瓑浜庤繖涓� dispatch 鐐广��
+ */
private boolean isCurrentOutOrderDispatchStation(Integer currentStationId,
WrkMast wrkMast,
List<Integer> outOrderStationIds,
@@ -1157,6 +1313,12 @@
&& Objects.equals(currentStationId, dispatchStationId);
}
+ /**
+ * 鍒ゆ柇褰撳墠浣嶇疆鏄惁灞炰簬璁惧閰嶇疆閲岀殑浠绘剰涓�涓帓搴忕偣銆�
+ *
+ * <p>杩欎釜鍒ゆ柇姣� {@link #isCurrentOutOrderDispatchStation(Integer, WrkMast, List, Double)} 鏇村锛�
+ * 鍙洖绛斺�滃綋鍓嶄綅缃槸涓嶆槸鎺掑簭鐐光�濓紝涓嶅洖绛斺�滄槸涓嶆槸杩欑エ浠诲姟褰撳墠搴旇鍛戒腑鐨勬帓搴忕偣鈥濄��
+ */
private boolean isCurrentOutOrderStation(Integer currentStationId,
List<Integer> outOrderStationIds) {
return currentStationId != null
@@ -1184,6 +1346,12 @@
}
}
+ /**
+ * 涓哄綋鍓嶆帓搴忕偣鍐崇瓥棰勫厛鍋氫竴娆＄幆绾胯瘎浼般��
+ *
+ * <p>褰撴湰娆″喅绛栨渶缁堣繘鍏ョ粫鍦堟椂锛岃瘎浼扮粨鏋滀細琚甫杩� {@link OutOrderDispatchDecision}锛�
+ * 鍚庣画鐢ㄤ簬璁板綍 loop issue 缁熻锛岃�屼笉鏄湪鐪熸涓嬪彂鍚庡啀閲嶅璇勪及涓�娆°��
+ */
private StationTaskLoopService.LoopEvaluation evaluateOutOrderLoop(Integer taskNo,
Integer currentStationId,
List<Integer> outOrderStationIds) {
@@ -1206,6 +1374,17 @@
);
}
+ /**
+ * 浠庘�滄簮绔欏埌涓氬姟鐩爣绔欌�濈殑瀹屾暣璺緞閲岋紝鍙嶆帹鍑哄綋鍓嶄换鍔″簲褰撳厛鍛戒腑鐨� dispatch 鎺掑簭鐐广��
+ *
+ * <p>鍋氭硶鏄細
+ * 1. 鍏堣绠椾粠 sourceStationId 鍒� finalTargetStationId 鐨勫畬鏁村鑸矾寰勶紱
+ * 2. 鍐嶄粠璺緞灏鹃儴鍚戝墠鎵弿锛�
+ * 3. 鎵惧埌绂绘渶缁堢洰鏍囨渶杩戠殑閭ｄ釜鎺掑簭鐐癸紝浣滀负褰撳墠 dispatch 鐩爣銆�
+ *
+ * <p>濡傛灉璺緞涓婃牴鏈病鏈夋帓搴忕偣锛屾垨鑰呯己灏戞簮绔�/鎺掑簭鐐归厤缃紝
+ * 灏辩洿鎺ユ妸涓氬姟鐩爣绔欐湰韬綋鎴� dispatch 鐩爣銆�
+ */
private Integer resolveDispatchOutOrderTarget(WrkMast wrkMast,
Integer sourceStationId,
Integer finalTargetStationId,
@@ -1236,6 +1415,13 @@
return finalTargetStationId;
}
+ /**
+ * 鍒ゆ柇浠庡綋鍓嶆帓搴忕偣缁х画鍓嶅線鏈�缁堜笟鍔＄洰鏍囩珯鏃讹紝璺緞涓婃槸鍚﹁嚦灏戝瓨鍦ㄤ竴涓彲杩涘叆鐨勫悗缁珯鐐广��
+ *
+ * <p>杩欓噷涓嶆槸瑕佹眰鏁存潯璺緞瀹屽叏鐣呴�氾紝鑰屾槸鍒ゆ柇鈥滃綋鍓嶆槸鍚︽湁閲婃斁鍙ｅ彲璧扳�濄��
+ * 鍙鍚庣画璺緞涓婂瓨鍦ㄤ竴涓湭闃诲绔欑偣锛屽氨璁や负褰撳墠浠嶅彲灏濊瘯鐩磋揪锛�
+ * 鍙湁鏁存鍚庣画璺緞鐪嬭捣鏉ラ兘琚樆濉炴椂锛屾墠浼氬己鍒惰浆鍏ョ粫鍦堛��
+ */
private boolean hasReachableOutReleaseSlot(WrkMast wrkMast,
Integer currentStationId,
Integer finalTargetStationId,
@@ -1291,6 +1477,28 @@
|| (stationProtocol.getTaskNo() != null && stationProtocol.getTaskNo() > 0);
}
+ /**
+ * 涓衡�滄帓搴忕偣闇�瑕佺粫鍦堚�濈殑鍦烘櫙锛屼粠鍑哄簱鎺掑簭绔欑偣鍒楄〃閲屾寫鍑轰笅涓�璺崇粫鍦堢洰鏍囥��
+ * <p>
+ * 杩欓噷鐨勮緭鍏ヤ笉鏄暣寮犲湴鍥撅紝鑰屾槸宸茬粡鎸変笟鍔￠『搴忔帓濂界殑鍑哄簱绔欑偣搴忓垪銆傛柟娉曚細浠庡綋鍓嶇珯鐐瑰湪璇ュ簭鍒椾腑鐨勫悗缁у紑濮嬶紝
+ * 渚濇灏濊瘯姣忎釜鍊欓�夌珯鐐癸紝骞惰绠椻�滃綋鍓嶇珯鐐� -> 鍊欓�夌珯鐐光�濈殑鍙璺緞锛�
+ * <p>
+ * 1. 鍙鑳界畻鍑鸿矾寰勶紝灏辨妸鍊欓�夌珯鐐硅褰曚负涓�涓彲閫夌粫鍦堢洰鏍囷紱
+ * 2. 璁板綍涓ょ被鎺掑簭淇℃伅锛�
+ * - pathLength锛氬埌璇ュ�欓�夌偣鐨勮矾寰勯暱搴︼紝瓒婄煭璇存槑瓒婇�傚悎鍏堟嬁鏉ュ仛涓存椂缂撳啿锛�
+ * - offset锛氳绔欑偣鍦ㄦ帓搴忓簭鍒椾腑璺濈褰撳墠绔欑偣鏈夊杩滐紝鐢ㄦ潵鍦ㄨ矾寰勯暱搴︾浉鍚岀殑鏃跺�欎繚鐣欐棦鏈夐『搴忔劅锛�
+ * 3. 鏈�鍚庢妸鍊欓�夊垪琛ㄤ氦缁� {@link #resolveGradualCircleTargetByPathLength(Integer, List, Double)}锛�
+ * 鍐嶆牴鎹�滃綋鍓嶅凡缁忕粫鍦堝灏戞鈥濅笌鈥滆矾寰勯暱搴﹀亸濂界郴鏁扳�濅粠涓嶅悓闀垮害灞傜骇閲屾寫鏈�缁堢洰鏍囥��
+ * <p>
+ * 杩欎釜鏂规硶鏈韩涓嶅垽鏂�滄槸鍚﹀簲璇ョ粫鍦堚�濓紝鍙礋璐ｅ湪宸茬粡鍐冲畾缁曞湀鍚庯紝浠庢帓搴忕珯鐐归摼璺噷鎵句竴涓笅涓�璺崇紦鍐茬偣銆�
+ *
+ * @param wrkMast 褰撳墠浠诲姟锛屼富瑕佺敤浜庣畻璺�
+ * @param currentStationId 褰撳墠绔欑偣锛屽嵆鏈鍑嗗浠庡摢閲屽彂鍑虹粫鍦堝懡浠�
+ * @param orderedOutStationList 宸叉寜涓氬姟椤哄簭鎺掑ソ鐨勫嚭搴撶珯鐐瑰垪琛�
+ * @param expectedLoopIssueCount 棰勮宸插彂鐢熺殑缁曞湀/鍫靛杞锛岀敤浜庡喅瀹氭槸鍚﹂�愭鏀惧ぇ缁曞湀鍗婂緞
+ * @param pathLenFactor 褰撳墠浠诲姟瀵瑰簲鐨勮矾寰勫亸濂界郴鏁帮紝褰卞搷 calcOutboundNavigatePath 鐨勯�夎矾缁撴灉
+ * @return 涓嬩竴璺崇粫鍦堢洰鏍囩珯锛涘鏋滄病鏈変换浣曞彲鍒拌揪鍊欓�夊垯杩斿洖 null
+ */
private Integer resolveNextCircleOrderTarget(WrkMast wrkMast,
Integer currentStationId,
List<Integer> orderedOutStationList,
@@ -1341,6 +1549,30 @@
return resolveGradualCircleTargetByPathLength(expectedLoopIssueCount, candidateList, pathLenFactor);
}
+ /**
+ * 鍦ㄢ�滃凡鎸夎矾寰勯暱搴﹀崌搴忔帓濂解�濈殑缁曞湀鍊欓�夊垪琛ㄤ腑锛屾寜灞傜骇娓愯繘鍦版寫閫夌洰鏍囩珯銆�
+ * <p>
+ * candidateList 閲屽彲鑳藉瓨鍦ㄥ涓�欓�夌偣鎷ユ湁鐩稿悓鐨� pathLength銆傚缁曞湀鍐崇瓥鏉ヨ锛�
+ * 鍚屼竴闀垮害灞傞噷鐨勫�欓�夌偣閮藉睘浜庘�滃悓涓�缁曞湀鍗婂緞鈥濓紝鐪熸闇�瑕佹帶鍒剁殑鏄細
+ * <p>
+ * 1. 鍒濇/鍓嶅嚑娆″牭濉炴椂锛屼紭鍏堥�夋嫨鏈�鐭彲杈惧眰锛屽敖閲忕敤鏈�灏忕粫琛岃窛绂绘仮澶嶆祦杞紱
+ * 2. 濡傛灉浠诲姟宸茬粡杩炵画澶氭鍦ㄥ悓涓�鍖哄煙缁曞湀锛岃鏄庣煭鍗婂緞鍊欓�夊ぇ姒傜巼宸茬粡璇曡繃鎴栨仮澶嶆晥鏋滃樊锛�
+ * 灏遍渶瑕侀�愭鏀惧ぇ鍒版洿杩滀竴灞傦紱
+ * 3. pathLenFactor 浠ｈ〃褰撳墠浠诲姟瀵光�滅煭璺緞/闀胯矾寰勨�濈殑鍋忓ソ锛屽厑璁稿湪鐩稿悓鍫靛杞涓嬮�傚害寰�鏇磋繙灞傚亸绉汇��
+ * <p>
+ * 鍥犳杩欓噷鍏堟妸 candidateList 鍘嬬缉鎴愨�滄寜 pathLength 鍘婚噸鍚庣殑 tierList鈥濓紝姣忎釜 tier 鍙繚鐣欒闀垮害灞傜殑棣栦釜鍊欓�夈��
+ * 鐒跺悗鍚屾椂璁＄畻涓や釜灞傜骇绱㈠紩锛�
+ * <p>
+ * - defaultTierIndex锛氬熀浜� expectedLoopIssueCount 鐨勯粯璁ゆ斁澶у眰绾э紱
+ * - factorTierIndex锛氬熀浜� pathLenFactor 鐨勫亸濂藉眰绾э紱
+ * <p>
+ * 鏈�缁堝彇涓よ�呰緝澶у�硷紝鍚箟鏄�滆嚦灏戞弧瓒冲綋鍓嶅牭濉炶疆娆￠渶瑕佺殑鏀惧ぇ鍗婂緞锛屽悓鏃跺厑璁歌矾寰勫亸濂芥妸鐩爣鎺ㄥ悜鏇磋繙灞傜骇鈥濄��
+ *
+ * @param expectedLoopIssueCount 棰勮宸插彂鐢熺殑缁曞湀/鍫靛杞
+ * @param candidateList 宸叉寜 pathLength銆乷ffset 鎺掑簭鐨勫�欓�夊垪琛�
+ * @param pathLenFactor 褰撳墠浠诲姟鐨勮矾寰勫亸濂界郴鏁�
+ * @return 鏈�缁堥�変腑鐨勭粫鍦堢洰鏍囩珯锛涜嫢娌℃湁鍊欓�夊垯杩斿洖 null
+ */
private Integer resolveGradualCircleTargetByPathLength(Integer expectedLoopIssueCount,
List<CircleTargetCandidate> candidateList,
Double pathLenFactor) {
@@ -1391,49 +1623,26 @@
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) {
if (stationMoveCoordinator != null) {
StationMoveSession session = stationMoveCoordinator.loadSession(wrkNo);
if (session != null && session.isActive() && stationId != null) {
+ // nextDecisionStationId 琛ㄧず杩欐潯璺嚎鐪熸绛夊緟閲嶆柊鍐崇瓥鐨勭珯鐐癸紝鍒扮珯鎵嶈Е鍙� watch-circle銆�
if (stationId.equals(session.getNextDecisionStationId())) {
return true;
}
+ // 杩樺湪 session 璺緞涓棿绔欒繍琛屾椂涓嶅簲璇Е鍙戙��
if (session.containsStation(stationId)) {
return false;
}
@@ -1672,26 +1881,51 @@
}
private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
- if (stationMoveCoordinator == null || taskNo == null || taskNo <= 0 || stationId == null) {
+ if (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) {
+ StationMoveSession session = stationMoveCoordinator == null ? null : stationMoveCoordinator.loadSession(taskNo);
+ if (session != null && session.isActive() && session.getLastIssuedAt() != null) {
+ // 鍒嗘鎵ц杩囩▼涓紝鍒氫笅鍙戜笅涓�娈靛懡浠ゆ椂锛宻ession 鐨� currentStationId/dispatchStationId
+ // 鍙兘杩樻病鏉ュ緱鍙婂拰褰撳墠瑙傚療绔欑偣瀹屽叏瀵归綈锛涘彧瑕佸綋鍓嶇珯鐐逛粛鍦ㄨ繖鏉℃椿鍔ㄨ矾绾块噷锛�
+ // 灏辫鏄庤繖娆� recent dispatch 浠嶇劧鍜屽畠鐩稿叧锛宨dle recover 涓嶅簲鍦� 10 绉掔獥鍙ｅ唴鍐嶆浠嬪叆銆�
+ if (Objects.equals(stationId, session.getCurrentStationId())
+ || Objects.equals(stationId, session.getDispatchStationId())
+ || session.containsStation(stationId)) {
+ long elapsedMs = System.currentTimeMillis() - session.getLastIssuedAt();
+ if (elapsedMs < thresholdMs) {
+ saveStationTaskIdleTrack(new StationTaskIdleTrack(taskNo, stationId, System.currentTimeMillis()));
+ News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛涓婃涓嬪彂={}ms锛宺outeVersion={}",
+ stationId, taskNo, elapsedMs, session.getRouteVersion());
+ return true;
+ }
+ }
+ }
+ if (!hasRecentIssuedMoveCommand(taskNo, stationId, thresholdMs)) {
return false;
}
saveStationTaskIdleTrack(new StationTaskIdleTrack(taskNo, stationId, System.currentTimeMillis()));
- News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛涓婃涓嬪彂={}ms锛宺outeVersion={}",
- stationId, taskNo, elapsedMs, session.getRouteVersion());
+ News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛鏈�杩戝懡浠や笅鍙�<{}ms锛宺outeVersion={}",
+ stationId, taskNo, thresholdMs, session == null ? null : session.getRouteVersion());
return true;
+ }
+
+ private boolean hasRecentIssuedMoveCommand(Integer taskNo, Integer stationId, long thresholdMs) {
+ if (taskNo == null || taskNo <= 0 || stationId == null || thresholdMs <= 0L || basStationOptService == null) {
+ return false;
+ }
+ Date thresholdTime = new Date(System.currentTimeMillis() - thresholdMs);
+ List<BasStationOpt> optList = basStationOptService.list(new QueryWrapper<BasStationOpt>()
+ .select("id")
+ .eq("task_no", taskNo)
+ .eq("station_id", stationId)
+ .eq("mode", String.valueOf(StationCommandType.MOVE))
+ .eq("send", 1)
+ .ge("send_time", thresholdTime)
+ .orderByDesc("send_time")
+ .last("limit 1"));
+ return optList != null && !optList.isEmpty();
}
private void resetSegmentMoveCommandsBeforeReroute(Integer taskNo) {
@@ -1883,10 +2117,33 @@
);
}
+ /**
+ * 娌库�滄簮绔� -> 鐩爣绔欌�濈殑鐞嗚璺緞锛屼粠褰撳墠绔欑偣寰�涓嬫父鍥炵湅锛屾壘鍑哄悓鎵规浠诲姟鍦ㄥ悗缁珯鐐逛笂鐨勫凡鐭ュ簭鍙枫��
+ * <p>
+ * 涓ユ牸绐楀彛鎺у埗瑕佸洖绛旂殑闂涓嶆槸鈥滃綋鍓嶄换鍔¤嚜宸辩殑 batchSeq 鏄灏戔�濓紝鑰屾槸锛�
+ * 鈥滃湪褰撳墠绔欑偣鍚庨潰锛屾部杩欐潯鍑哄簱閾捐矾宸茬粡鎺掔潃鐨勫悓鎵规浠诲姟锛屾渶闈犺繎鐩爣绔殑搴忓彿鏄灏戯紵鈥�
+ * 鍙湁鎷垮埌杩欎釜搴忓彿锛屾帓搴忕偣鎵嶈兘鍒ゆ柇褰撳墠浠诲姟鏄惁搴旇绱ц窡鍏跺悗鏀捐銆�
+ * <p>
+ * 鍏蜂綋鍋氭硶锛�
+ * <p>
+ * 1. 鎸� pathList 浠庡熬鍒板ご鍥炴壂锛屾埅鍑� searchStationId 涔嬪悗鐨勫叏閮ㄤ笅娓哥珯鐐癸紱
+ * 2. 璇诲彇杩欎簺绔欑偣褰撳墠姝ｅ湪鎵ц鐨勪换鍔″彿锛�
+ * 3. 濡傛灉鏌愮珯鐐逛笂鐨勪换鍔″睘浜� searchBatch锛屽氨璁板綍瀹冪殑 batchSeq锛�
+ * 4. 杩斿洖璇ユ壒娆″湪涓嬫父宸茬煡鐨勫簭鍙枫��
+ * <p>
+ * 杩欓噷杩斿洖鐨勬槸鈥滆矾寰勪笅娓哥幇鍦哄凡鍑虹幇鐨勬壒娆″簭鍙封�濓紝涓嶆槸鎵规鐞嗚鏈�灏�/鏈�澶у�笺��
+ * 濡傛灉涓嬫父娌℃湁鍚屾壒娆′换鍔★紝杩斿洖 null锛岃皟鐢ㄦ柟闇�瑕侀��鍥炲埌鈥滃綋鍓嶆壒娆￠涓湭瀹屾垚浠诲姟鏄惁灏辨槸鑷繁鈥濈殑鍒ゅ畾銆�
+ *
+ * @param pathList 浠庝换鍔℃簮绔欏埌鐩爣绔欑殑鐞嗚鍑哄簱璺緞
+ * @param searchStationId 褰撳墠姝ｅ湪鍋氭帓搴忓喅绛栫殑绔欑偣
+ * @param searchBatch 褰撳墠浠诲姟鎵�灞炴壒娆�
+ * @return 涓嬫父鍚屾壒娆′换鍔＄殑宸茬煡搴忓彿锛涜嫢璺緞涓嬫父灏氭湭鍑虹幇璇ユ壒娆″垯杩斿洖 null
+ */
public Integer getOutStationBatchSeq(List<NavigateNode> pathList, Integer searchStationId, String searchBatch) {
if (pathList == null || pathList.isEmpty() || searchStationId == null || Cools.isEmpty(searchBatch)) {
return null;
}
+ // 鍙叧蹇冨綋鍓嶇珯鐐逛箣鍚庣殑涓嬫父绔欑偣锛屽綋鍓嶇珯鐐逛箣鍓嶇殑鑺傜偣涓嶄細褰卞搷鈥滆皝搴旇鎺掑湪鎴戝墠闈⑩�濄��
List<Integer> checkList = new ArrayList<>();
for (int i = pathList.size() - 1; i >= 0; i--) {
NavigateNode node = pathList.get(i);
@@ -1901,6 +2158,7 @@
}
}
+ // 涓嬫父绔欑偣鍙兘鍚屾椂鎸傜潃澶氫釜涓嶅悓鎵规浠诲姟锛涜繖閲屽彧鎶藉彇涓庡綋鍓嶆壒娆＄浉鍏崇殑鐜板満搴忓彿蹇収銆�
HashMap<String, Integer> batchMap = new HashMap<>();
for (Integer station : checkList) {
BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", station));
@@ -2140,25 +2398,85 @@
}
}
+ /**
+ * 閲嶇畻/閲嶅彂閾捐矾鐨勪竴娆℃�ф墽琛屼笂涓嬫枃銆�
+ *
+ * <p>杩欎釜瀵硅薄鍙湪涓�娆� reroute 鎵ц杩囩▼涓瓨鍦紝涓嶄細钀藉簱锛屼篃涓嶄細闀挎湡缂撳瓨銆�
+ * 瀹冪殑鑱岃矗涓嶆槸琛ㄨ揪涓氬姟鐘舵�侊紝鑰屾槸鎶娾�滆繖娆′负浠�涔堣繘鏉ャ�佸綋鍓嶇敤鍝杩愯鏃跺璞°��
+ * 涓嬪彂鍓嶅悗瑕佷笉瑕佸惎鐢ㄩ澶栨帶鍒堕�昏緫鈥濋泦涓墦鍖咃紝渚涚粺涓�鎵ц閾捐矾浣跨敤銆�
+ *
+ * <p>缁熶竴鎵ц閾捐矾澶ц嚧鍒嗕笁娈碉細
+ * 1. {@code resolveSharedRerouteDecision} 鏍规嵁褰撳墠浠诲姟鍜屽満鏅厛鍐崇瓥鐩爣绔欍��
+ * 2. {@code buildRerouteCommandPlan} 鍐冲畾鐢ㄦ櫘閫氬嚭搴撶畻璺繕鏄� run-block 涓撶敤绠楄矾銆�
+ * 3. {@code executeReroutePlan} 鎸変笂涓嬫枃閲岀殑寮�鍏冲喅瀹氭槸鍚﹀仛 suppress銆佹槸鍚﹀姞閿併��
+ * 鏄惁鍏� cancel 鏃� session銆佹槸鍚﹀厛娓呮棫鍒嗘鍛戒护锛岀劧鍚庣湡姝ｄ笅鍙戙��
+ *
+ * <p>瀛楁鍙互鍒嗘垚鍥涚粍鐞嗚В锛�
+ * 1. 鍦烘櫙涓庤繍琛屾椂瀵硅薄锛�
+ * {@code sceneType} / {@code basDevp} / {@code stationThread} /
+ * {@code stationProtocol} / {@code wrkMast}
+ * 琛ㄧず鈥滆皝鍦ㄤ粈涔堝満鏅笅瑙﹀彂浜嗚繖娆￠噸绠椻�濄��
+ * 2. 鐩爣鍐崇瓥杈撳叆锛�
+ * {@code outOrderStationIds} / {@code pathLenFactor}
+ * 琛ㄧず鈥滅洰鏍囩珯濡備綍绠椼�佽矾寰勫�惧悜绯绘暟鏄灏戔�濄��
+ * 3. 涓嬪彂鐩爣淇℃伅锛�
+ * {@code dispatchScene} / {@code dispatchDeviceNo}
+ * 琛ㄧず鈥滆繖娆″懡浠ゆ渶缁堝線鍝釜杈撻�佽澶囬槦鍒楀彂锛屼互鍙婃棩蹇�/鍘婚噸鍦烘櫙鍚嶆槸浠�涔堚�濄��
+ * 4. 鎵ц鎺у埗寮�鍏筹細
+ * {@code useRunBlockCommand} / {@code checkSuppressDispatch} /
+ * {@code requireOutOrderDispatchLock} / {@code cancelSessionBeforeDispatch} /
+ * {@code resetSegmentCommandsBeforeDispatch} / {@code clearIdleIssuedCommands} /
+ * {@code checkRecentDispatch} / {@code executionLockKey} / {@code executionLockSeconds}
+ * 琛ㄧず鈥滅湡姝ｆ墽琛屽墠鍚庤鎵撳紑鍝簺淇濇姢鍔ㄤ綔鈥濄��
+ *
+ * <p>瀹冩湰璐ㄤ笂鏄竴涓弬鏁板璞″姞甯冨皵寮�鍏抽泦鍚堬細
+ * {@code create(...)} 鍏堟妸杩欐 reroute 鐨勫熀纭�鐜板満濉繘鏉ワ紝
+ * 鍐嶉�氳繃 {@code withXxx(...)} 閫愰」澹版槑杩欐鎵ц闇�瑕侀檮鍔犲摢浜涙帶鍒惰涔夈��
+ *
+ * <p>渚嬪锛�
+ * RUN_BLOCK_REROUTE 浼氭墦寮� {@code useRunBlockCommand}锛�
+ * 骞惰姹傚湪涓嬪彂鍓嶅厛 {@code cancelSession}銆佸厛娓呮棫鍒嗘鍛戒护锛�
+ * OUT_ORDER 浼氭墦寮� suppress guard 鍜� out-order lock锛�
+ * IDLE_RECOVER 鍒欎細鎵撳紑 recent dispatch guard锛屽苟璁板綍/娓呯悊鍋滅暀鏈熼棿宸蹭笅鍙戝懡浠ゃ��
+ */
static final class RerouteContext {
+ // 鏈 reroute 鐨勮Е鍙戞潵婧愩�傚喅瀹氬悗闈㈣蛋鍝被鐩爣瑁佸喅銆佹棩蹇楁枃妗堝拰鐗规畩淇濇姢鍒嗘敮銆�
private final RerouteSceneType sceneType;
+ // 褰撳墠杈撻�佽澶囬厤缃紝涓昏鐢ㄤ簬鎷块粯璁や笅鍙戣澶囧彿鍜岀浉鍏崇珯鐐归厤缃��
private final BasDevp basDevp;
+ // 褰撳墠绔欑偣绾跨▼锛屽悗闈㈡瀯閫犺緭閫佸懡浠ゆ椂鐩存帴渚濊禆瀹冨彇 command銆�
private final StationThread stationThread;
+ // 瑙﹀彂杩欐 reroute 鐨勭幇鍦虹珯鐐圭姸鎬佸揩鐓э紝鍖呭惈 stationId/taskNo/runBlock/targetStaNo 绛夎繍琛屾椂淇℃伅銆�
private final StationProtocol stationProtocol;
+ // 褰撳墠宸ヤ綔涓昏〃璁板綍锛岃〃绀鸿繖娆￠噸绠楀搴旂殑浠诲姟涓荤姸鎬併��
private final WrkMast wrkMast;
+ // 褰撳墠璁惧鐨勫嚭搴撴帓搴忕偣鍒楄〃銆傜洰鏍囩珯鍐崇瓥鏃堕渶瑕佺煡閬撳摢浜涚珯鐐瑰睘浜� out-order 鑺傜偣銆�
private final List<Integer> outOrderStationIds;
+ // 璺緞闀垮害鍊惧悜绯绘暟銆傛壒娆″嚭搴撴椂鐢ㄤ簬璁╀笉鍚屼换鍔″璺緞閫夋嫨鏈夌ǔ瀹氬亸濂姐��
private final Double pathLenFactor;
+ // 杩欐娲惧彂鍦ㄦ棩蹇椼�佸幓閲嶃�乻ession 璁板綍涓娇鐢ㄧ殑鍦烘櫙鍚嶏紝渚嬪 checkStationRunBlock_reroute銆�
private final String dispatchScene;
+ // 瀹為檯鎶曢�掑懡浠ょ殑璁惧鍙枫�傞粯璁ゅ彇 basDevp.getDevpNo()锛屾煇浜涘満鏅彲鏄惧紡瑕嗙洊銆�
private Integer dispatchDeviceNo;
+ // true 琛ㄧず鍛戒护鏋勯�犻樁娈垫敼璧� stationThread.getRunBlockRerouteCommand锛岃�屼笉鏄櫘閫氬嚭搴撶畻璺��
private boolean useRunBlockCommand;
+ // true 琛ㄧず鎵ц鍓嶈鍏堝仛 active-session suppress锛岄伩鍏嶆棫娲诲姩璺嚎琚噸澶嶆彃鍏ユ柊鍛戒护銆�
private boolean checkSuppressDispatch;
+ // true 琛ㄧず鎵ц鍓嶈鍔� out-order 涓撶敤鐭攣锛岄槻姝㈠悓涓�鎺掑簭鐐圭煭鏃堕棿閲嶅璁＄畻/涓嬪彂銆�
private boolean requireOutOrderDispatchLock;
+ // true 琛ㄧず鐪熸涓嬪彂鍓嶅厛鍙栨秷鏃� session銆傞�氬父鐢ㄤ簬 reroute 鏇挎崲鏃ц矾绾裤��
private boolean cancelSessionBeforeDispatch;
+ // true 琛ㄧず鐪熸涓嬪彂鍓嶅厛娓呯悊鏃у垎娈佃緭閫佸懡浠わ紝閬垮厤 segment executor 杩樻寔鏈夋棫璺嚎銆�
private boolean resetSegmentCommandsBeforeDispatch;
+ // true 琛ㄧず瑕佹竻鐞� idle recover 鏈熼棿宸茬粡涓嬪彂杩囦絾鏈疄闄呯敓鏁堢殑鏃у懡浠ょ棔杩广��
private boolean clearIdleIssuedCommands;
+ // true 琛ㄧず鎵ц鍓嶈妫�鏌モ�滄渶杩戝垰涓嬪彂杩団�濓紝鐢ㄤ簬 idle recover 閬垮厤鍒氬彂瀹屽氨閲嶇畻銆�
private boolean checkRecentDispatch;
+ // 鍙�夋墽琛岄攣 key銆傜敤浜庣粰鏌愪釜 reroute 鍦烘櫙鍔犵煭鏃堕棿浜掓枼銆�
private String executionLockKey;
+ // executionLockKey 瀵瑰簲鐨勯攣绉掓暟銆�
private int executionLockSeconds;
+ // 浠� idle recover 闇�瑕侊紝璁板綍鍋滅暀璺熻釜涓婁笅鏂囷紝渚涙竻鐞嗘棫鍛戒护涓庢洿鏂版椂闂翠娇鐢ㄣ��
private StationTaskIdleTrack idleTrack;
private RerouteContext(RerouteSceneType sceneType,
@@ -2188,51 +2506,70 @@
List<Integer> outOrderStationIds,
Double pathLenFactor,
String dispatchScene) {
+ // create 鍙礋璐ｅ～鍩虹鐜板満锛屼笉榛樿鎵撳紑浠讳綍鎵ц寮�鍏炽��
+ // 姣忎釜鍦烘櫙鍚庨潰閫氳繃 withXxx 鏄庣‘澹版槑鑷繁闇�瑕佸摢浜涢檮鍔犳帶鍒躲��
return new RerouteContext(sceneType, basDevp, stationThread, stationProtocol, wrkMast, outOrderStationIds, pathLenFactor, dispatchScene);
}
RerouteContext withDispatchDeviceNo(Integer dispatchDeviceNo) {
+ // 瑕嗙洊榛樿涓嬪彂璁惧鍙枫�傚吀鍨嬪満鏅槸 out-order 绔欑偣閰嶇疆鐨� deviceNo 涓� basDevp 榛樿鍊间笉鍚屻��
this.dispatchDeviceNo = dispatchDeviceNo;
return this;
}
RerouteContext withRunBlockCommand() {
+ // 鍛戒护鏋勯�犻樁娈靛垏鎹㈠埌 run-block 涓撶敤绠楄矾鍣ㄣ��
+ // 鐩爣绔欎粛鐢辩粺涓�鍐崇瓥閫昏緫鍐冲畾锛屽彧鏄�滃幓鐩爣绔欑殑璺緞鈥濇敼涓哄牭濉為噸瑙勫垝绠楁硶鐢熸垚銆�
this.useRunBlockCommand = true;
return this;
}
RerouteContext withSuppressDispatchGuard() {
+ // 鎵ц鍓嶅惎鐢� session suppress锛�
+ // 濡傛灉褰撳墠 task 鍦ㄥ綋鍓嶄綅缃凡缁忔湁涓�鏉℃椿鍔ㄤ腑鐨勫悓璺緞/鍚岃鐩栬寖鍥磋矾绾匡紝鍒欐湰娆′笉鍐嶉噸澶嶆淳鍙戙��
this.checkSuppressDispatch = true;
return this;
}
RerouteContext withOutOrderDispatchLock() {
+ // 鎵ц鍓嶅惎鐢ㄦ帓搴忕偣鐭攣銆�
+ // 涓昏闃叉鍚屼竴涓� out-order/watch-circle 瑙﹀彂鐐瑰湪鏋佺煭鏃堕棿鍐呰骞跺彂閲嶅閲嶇畻銆�
this.requireOutOrderDispatchLock = true;
return this;
}
RerouteContext withCancelSessionBeforeDispatch() {
+ // 鎵ц鍓嶆樉寮忓彇娑堟棫 session銆�
+ // 璇箟鏄�滄湰娆″懡浠ゅ噯澶囨浛鎹㈡棫璺嚎鈥濓紝鏃� routeVersion 涔嬪悗涓嶅簲鍐嶇户缁帹杩涖��
this.cancelSessionBeforeDispatch = true;
return this;
}
RerouteContext withResetSegmentCommandsBeforeDispatch() {
+ // 鎵ц鍓嶆竻鎺� segment executor 渚ф棫鍒嗘鍛戒护銆�
+ // 杩欏 run-block/idle recover 寰堝叧閿紝鍚﹀垯绯荤粺鍙兘杩樻嬁鐫�鏃� segment 鐘舵�侀樆鏂柊璺嚎銆�
this.resetSegmentCommandsBeforeDispatch = true;
return this;
}
RerouteContext clearIdleIssuedCommands(StationTaskIdleTrack idleTrack) {
+ // 浠� idle recover 浣跨敤锛�
+ // 琛ㄧず閲嶅惎鍓嶈鎶娾�滃仠鐣欐湡闂村凡缁忓彂杩囦絾鍙兘鏈湡姝ｆ墽琛岀殑鍛戒护鐥曡抗鈥濇竻鐞嗘帀銆�
this.clearIdleIssuedCommands = true;
this.idleTrack = idleTrack;
return this;
}
RerouteContext withRecentDispatchGuard() {
+ // 鎵ц鍓嶆鏌ユ渶杩戞槸鍚﹀垰涓嬪彂杩囥��
+ // 閬垮厤 idle recover 鍦ㄢ�滃垰閲嶅彂瀹屸�濈殑绐楀彛鍐呭張椹笂瑙﹀彂涓�娆°��
this.checkRecentDispatch = true;
return this;
}
RerouteContext withExecutionLock(String executionLockKey, int executionLockSeconds) {
+ // 涓烘煇涓満鏅寕涓�涓嫭绔嬫墽琛岄攣銆�
+ // 鍜� out-order lock 涓嶅悓锛岃繖閲屾槸娉涘寲閿侊紝璋佷紶 key 璋佽礋璐ｅ畾涔夐攣璇箟銆�
this.executionLockKey = executionLockKey;
this.executionLockSeconds = executionLockSeconds;
return this;
--
Gitblit v1.9.1