From eb7936b4b850ce1093b3d4ebac797230a59ca373 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 20 三月 2026 17:25:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java | 6 +-
src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java | 2
src/main/webapp/views/stationPathPolicy/stationPathPolicy.html | 3
src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js | 1
src/main/java/com/zy/common/utils/NavigateUtils.java | 147 +++++++++++++++++++++++++++++++++++++++++++++++--
src/main/resources/sql/20260313_create_station_path_policy_tables.sql | 2
6 files changed, 150 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java b/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
index 0596a7e..48265c7 100644
--- a/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
+++ b/src/main/java/com/zy/asrs/domain/path/StationPathProfileConfig.java
@@ -23,6 +23,7 @@
private Double s2BusyWeight = 2.0d;
private Double s2QueueWeight = 2.5d;
private Double s2WaitWeight = 1.5d;
+ private Double s2DeadlockWeight = 8.0d;
private Double s2RunBlockWeight = 10.0d;
private Double s2LoopLoadWeight = 12.0d;
@@ -52,6 +53,7 @@
if (source.s2BusyWeight != null) this.s2BusyWeight = source.s2BusyWeight;
if (source.s2QueueWeight != null) this.s2QueueWeight = source.s2QueueWeight;
if (source.s2WaitWeight != null) this.s2WaitWeight = source.s2WaitWeight;
+ if (source.s2DeadlockWeight != null) this.s2DeadlockWeight = source.s2DeadlockWeight;
if (source.s2RunBlockWeight != null) this.s2RunBlockWeight = source.s2RunBlockWeight;
if (source.s2LoopLoadWeight != null) this.s2LoopLoadWeight = source.s2LoopLoadWeight;
if (source.stationPathLenWeightPercent != null) this.stationPathLenWeightPercent = source.stationPathLenWeightPercent;
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index dde22c1..024ac05 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -50,6 +50,7 @@
private static final double WAIT_ISSUED_RESERVE_SECONDS = 8.0d;
private static final double WAIT_PENDING_QUEUE_SECONDS = 5.0d;
private static final double WAIT_RUN_BLOCK_SECONDS = 30.0d;
+ private static final int DEADLOCK_PREFIX_LOOKAHEAD = 6;
@Autowired
private BasStationService basStationService;
@@ -61,6 +62,10 @@
private StationTaskTraceRegistry stationTaskTraceRegistry;
public synchronized List<NavigateNode> calcByStationId(Integer startStationId, Integer endStationId) {
+ return calcByStationId(startStationId, endStationId, null);
+ }
+
+ public synchronized List<NavigateNode> calcByStationId(Integer startStationId, Integer endStationId, Integer currentTaskNo) {
BasStation startStation = basStationService.getById(startStationId);
if (startStation == null) {
throw new CoolException("鏈壘鍒拌 璧风偣 瀵瑰簲鐨勭珯鐐规暟鎹�");
@@ -114,7 +119,7 @@
startTime = System.currentTimeMillis();
News.info("[WCS Debug] 绔欑偣璺緞鏉冮噸寮�濮嬪垎鏋�,startStationId={},endStationId={}", startStationId, endStationId);
- List<NavigateNode> list = findStationBestPathTwoStage(allList, resolvedPolicy);
+ List<NavigateNode> list = findStationBestPathTwoStage(allList, resolvedPolicy, currentTaskNo);
News.info("[WCS Debug] 绔欑偣璺緞鏉冮噸鍒嗘瀽瀹屾垚锛岃�楁椂锛歿}ms", System.currentTimeMillis() - startTime);
//鍘婚噸
@@ -272,7 +277,9 @@
return new StationPathResolvedPolicy();
}
- private List<NavigateNode> findStationBestPathTwoStage(List<List<NavigateNode>> allList, StationPathResolvedPolicy resolvedPolicy) {
+ private List<NavigateNode> findStationBestPathTwoStage(List<List<NavigateNode>> allList,
+ StationPathResolvedPolicy resolvedPolicy,
+ Integer currentTaskNo) {
if (allList == null || allList.isEmpty()) {
return new ArrayList<>();
}
@@ -310,7 +317,7 @@
Map<Integer, StationProtocol> statusMap = loadStationStatusMap();
Map<Integer, Double> stationLoopLoadMap = loadStationLoopLoadMap();
- StationTrafficSnapshot trafficSnapshot = loadStationTrafficSnapshot(statusMap);
+ StationTrafficSnapshot trafficSnapshot = loadStationTrafficSnapshot(statusMap, currentTaskNo);
Set<Integer> outStationIdSet = loadAllOutStationIdSet();
List<PathCandidateMetrics> metricsList = new ArrayList<>();
int skippedByOtherOutStation = 0;
@@ -592,6 +599,7 @@
metrics.congestionScore = calcCongestionScore(stationIdList, trafficSnapshot);
metrics.queueDepthScore = calcQueueDepthScore(stationIdList, trafficSnapshot);
metrics.estimatedWaitSeconds = calcEstimatedWaitSeconds(stationIdList, trafficSnapshot);
+ metrics.deadlockRiskScore = calcDeadlockRiskScore(stationIdList, trafficSnapshot);
metrics.runBlockCount = countRunBlockCount(stationIdList, statusMap);
metrics.loopPenalty = calcLoopPenalty(stationIdList, stationLoopLoadMap);
metrics.passOtherOutStationCount = countPassOtherOutStations(path, outStationIdSet);
@@ -618,6 +626,7 @@
safeDouble(profileConfig.getS2BusyWeight(), 2.0d) * congWeightFactor * metrics.congestionScore
+ safeDouble(profileConfig.getS2QueueWeight(), 2.5d) * metrics.queueDepthScore
+ safeDouble(profileConfig.getS2WaitWeight(), 1.5d) * (metrics.estimatedWaitSeconds / 60.0d)
+ + safeDouble(profileConfig.getS2DeadlockWeight(), 8.0d) * metrics.deadlockRiskScore
+ safeDouble(profileConfig.getS2RunBlockWeight(), 10.0d) * metrics.runBlockCount
+ safeDouble(profileConfig.getS2LoopLoadWeight(), 12.0d) * metrics.loopPenalty;
return metrics;
@@ -693,6 +702,36 @@
score += trafficSnapshot.estimatedWaitSecondsMap.getOrDefault(stationId, 0.0d);
}
return score;
+ }
+
+ private double calcDeadlockRiskScore(List<Integer> stationIdList, StationTrafficSnapshot trafficSnapshot) {
+ if (trafficSnapshot == null || trafficSnapshot.traceRouteList.isEmpty() || stationIdList == null || stationIdList.size() <= 1) {
+ return 0.0d;
+ }
+ List<Integer> candidateFutureStations = distinctPositiveStationIds(stationIdList.subList(1, stationIdList.size()));
+ if (candidateFutureStations.isEmpty()) {
+ return 0.0d;
+ }
+
+ double totalRisk = 0.0d;
+ for (TraceRouteSnapshot routeSnapshot : trafficSnapshot.traceRouteList) {
+ if (routeSnapshot == null) {
+ continue;
+ }
+ OverlapMetrics pendingMetrics = calcOrderedOverlapMetrics(candidateFutureStations, routeSnapshot.pendingStationIds);
+ OverlapMetrics issuedMetrics = calcOrderedOverlapMetrics(candidateFutureStations, routeSnapshot.issuedStationIds);
+
+ totalRisk += pendingMetrics.sequentialRisk * 0.9d;
+ totalRisk += issuedMetrics.sequentialRisk * 1.2d;
+ totalRisk += pendingMetrics.sharedCount * 0.12d;
+ totalRisk += issuedMetrics.sharedCount * 0.18d;
+
+ int currentHitIndex = findFirstOverlapIndex(candidateFutureStations, routeSnapshot.currentStationId);
+ if (currentHitIndex >= 0) {
+ totalRisk += prefixRiskFactor(currentHitIndex) * 1.5d;
+ }
+ }
+ return totalRisk;
}
private int countRunBlockCount(List<Integer> stationIdList, Map<Integer, StationProtocol> statusMap) {
@@ -887,7 +926,7 @@
return stationLoopLoadMap;
}
- private StationTrafficSnapshot loadStationTrafficSnapshot(Map<Integer, StationProtocol> statusMap) {
+ private StationTrafficSnapshot loadStationTrafficSnapshot(Map<Integer, StationProtocol> statusMap, Integer currentTaskNo) {
StationTrafficSnapshot snapshot = new StationTrafficSnapshot();
Map<Integer, Integer> busyMap = new HashMap<>();
Map<Integer, Integer> issuedReserveMap = new HashMap<>();
@@ -906,12 +945,18 @@
}
}
- for (StationTaskTraceVo traceVo : loadActiveTraceList()) {
+ for (StationTaskTraceVo traceVo : loadActiveTraceList(currentTaskNo)) {
if (traceVo == null) {
continue;
}
List<Integer> pendingStationIds = distinctPositiveStationIds(traceVo.getPendingStationIds());
List<Integer> issuedStationIds = distinctPositiveStationIds(traceVo.getLatestIssuedSegmentPath());
+ TraceRouteSnapshot routeSnapshot = new TraceRouteSnapshot();
+ routeSnapshot.taskNo = traceVo.getTaskNo();
+ routeSnapshot.currentStationId = traceVo.getCurrentStationId();
+ routeSnapshot.pendingStationIds = pendingStationIds;
+ routeSnapshot.issuedStationIds = issuedStationIds;
+ snapshot.traceRouteList.add(routeSnapshot);
Set<Integer> pendingSet = new HashSet<>(pendingStationIds);
for (Integer stationId : issuedStationIds) {
if (stationId == null || !pendingSet.contains(stationId)) {
@@ -972,7 +1017,7 @@
return snapshot;
}
- private List<StationTaskTraceVo> loadActiveTraceList() {
+ private List<StationTaskTraceVo> loadActiveTraceList(Integer currentTaskNo) {
if (stationTaskTraceRegistry == null) {
return Collections.emptyList();
}
@@ -989,6 +1034,9 @@
List<StationTaskTraceVo> result = new ArrayList<>();
for (StationTaskTraceVo traceVo : traceList) {
if (!isPlanningActiveTrace(traceVo)) {
+ continue;
+ }
+ if (currentTaskNo != null && currentTaskNo.equals(traceVo.getTaskNo())) {
continue;
}
result.add(traceVo);
@@ -1030,6 +1078,79 @@
target.put(stationId, target.getOrDefault(stationId, 0) + delta);
}
+ private OverlapMetrics calcOrderedOverlapMetrics(List<Integer> candidateStations, List<Integer> routeStations) {
+ OverlapMetrics metrics = new OverlapMetrics();
+ if (candidateStations == null || candidateStations.isEmpty() || routeStations == null || routeStations.isEmpty()) {
+ return metrics;
+ }
+
+ Map<Integer, Integer> routeIndexMap = new HashMap<>();
+ for (int i = 0; i < routeStations.size(); i++) {
+ Integer stationId = routeStations.get(i);
+ if (stationId != null && !routeIndexMap.containsKey(stationId)) {
+ routeIndexMap.put(stationId, i);
+ }
+ }
+ if (routeIndexMap.isEmpty()) {
+ return metrics;
+ }
+
+ for (int i = 0; i < candidateStations.size(); i++) {
+ Integer stationId = candidateStations.get(i);
+ if (stationId != null && routeIndexMap.containsKey(stationId)) {
+ metrics.sharedCount++;
+ }
+ }
+
+ for (int candidateStart = 0; candidateStart < candidateStations.size(); candidateStart++) {
+ Integer firstStation = candidateStations.get(candidateStart);
+ Integer routeStart = routeIndexMap.get(firstStation);
+ if (routeStart == null) {
+ continue;
+ }
+
+ int length = 1;
+ int prevRouteIndex = routeStart;
+ for (int j = candidateStart + 1; j < candidateStations.size(); j++) {
+ Integer nextRouteIndex = routeIndexMap.get(candidateStations.get(j));
+ if (nextRouteIndex == null || nextRouteIndex.intValue() != prevRouteIndex + 1) {
+ break;
+ }
+ length++;
+ prevRouteIndex = nextRouteIndex;
+ }
+
+ double risk = length * prefixRiskFactor(candidateStart);
+ if (risk > metrics.sequentialRisk) {
+ metrics.sequentialRisk = risk;
+ }
+ }
+ return metrics;
+ }
+
+ private int findFirstOverlapIndex(List<Integer> stationIdList, Integer targetStationId) {
+ if (stationIdList == null || stationIdList.isEmpty() || targetStationId == null) {
+ return -1;
+ }
+ for (int i = 0; i < stationIdList.size(); i++) {
+ Integer stationId = stationIdList.get(i);
+ if (targetStationId.equals(stationId)) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ private double prefixRiskFactor(int candidateIndex) {
+ if (candidateIndex < 0) {
+ return 0.0d;
+ }
+ if (candidateIndex >= DEADLOCK_PREFIX_LOOKAHEAD) {
+ return 0.15d;
+ }
+ return (double) (DEADLOCK_PREFIX_LOOKAHEAD - candidateIndex) / (double) DEADLOCK_PREFIX_LOOKAHEAD;
+ }
+
private int compareDouble(double left, double right, int thenLeft1, int thenRight1, int thenLeft2, int thenRight2) {
int result = Double.compare(left, right);
if (result != 0) {
@@ -1067,6 +1188,7 @@
private double congestionScore;
private double queueDepthScore;
private double estimatedWaitSeconds;
+ private double deadlockRiskScore;
private int runBlockCount;
private int softDeviationCount;
private double loopPenalty;
@@ -1078,6 +1200,19 @@
private final Map<Integer, Double> congestionScoreMap = new HashMap<>();
private final Map<Integer, Integer> queueDepthMap = new HashMap<>();
private final Map<Integer, Double> estimatedWaitSecondsMap = new HashMap<>();
+ private final List<TraceRouteSnapshot> traceRouteList = new ArrayList<>();
+ }
+
+ private static class TraceRouteSnapshot {
+ private Integer taskNo;
+ private Integer currentStationId;
+ private List<Integer> pendingStationIds = Collections.emptyList();
+ private List<Integer> issuedStationIds = Collections.emptyList();
+ }
+
+ private static class OverlapMetrics {
+ private int sharedCount;
+ private double sequentialRisk;
}
private static class PathGlobalPolicy {
diff --git a/src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java b/src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java
index c59e7ef..d1789bc 100644
--- a/src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZyStationV5Thread.java
@@ -228,7 +228,7 @@
stationCommand.setCommandType(commandType);
if (commandType == StationCommandType.MOVE && !stationId.equals(targetStationId)) {
- List<NavigateNode> nodes = calcPathNavigateNodes(stationId, targetStationId);
+ List<NavigateNode> nodes = calcPathNavigateNodes(taskNo, stationId, targetStationId);
List<Integer> path = new ArrayList<>();
List<Integer> liftTransferPath = new ArrayList<>();
for (NavigateNode n : nodes) {
@@ -302,11 +302,11 @@
return zyStationConnectDriver.readOriginCommand(address, length);
}
- private List<NavigateNode> calcPathNavigateNodes(Integer startStationId, Integer targetStationId) {
+ private List<NavigateNode> calcPathNavigateNodes(Integer taskNo, Integer startStationId, Integer targetStationId) {
NavigateUtils navigateUtils = SpringUtils.getBean(NavigateUtils.class);
if (navigateUtils == null) {
return new ArrayList<>();
}
- return navigateUtils.calcByStationId(startStationId, targetStationId);
+ return navigateUtils.calcByStationId(startStationId, targetStationId, taskNo);
}
}
diff --git a/src/main/resources/sql/20260313_create_station_path_policy_tables.sql b/src/main/resources/sql/20260313_create_station_path_policy_tables.sql
index c810ed3..080be0c 100644
--- a/src/main/resources/sql/20260313_create_station_path_policy_tables.sql
+++ b/src/main/resources/sql/20260313_create_station_path_policy_tables.sql
@@ -45,7 +45,7 @@
100,
1,
1,
- '{"calcMaxDepth":120,"calcMaxPaths":500,"calcMaxCost":300,"s1TopK":5,"s1LenWeight":1.0,"s1TurnWeight":3.0,"s1LiftWeight":8.0,"s1SoftDeviationWeight":4.0,"s1MaxLenRatio":1.15,"s1MaxTurnDiff":1,"s2BusyWeight":2.0,"s2QueueWeight":2.5,"s2WaitWeight":1.5,"s2RunBlockWeight":10.0,"s2LoopLoadWeight":12.0,"stationPathLenWeightPercent":50.0,"stationPathCongWeightPercent":50.0,"stationPathPassOtherOutStationWeightPercent":100.0,"stationPathPassOtherOutStationForceSkip":false}',
+ '{"calcMaxDepth":120,"calcMaxPaths":500,"calcMaxCost":300,"s1TopK":5,"s1LenWeight":1.0,"s1TurnWeight":3.0,"s1LiftWeight":8.0,"s1SoftDeviationWeight":4.0,"s1MaxLenRatio":1.15,"s1MaxTurnDiff":1,"s2BusyWeight":2.0,"s2QueueWeight":2.5,"s2WaitWeight":1.5,"s2DeadlockWeight":8.0,"s2RunBlockWeight":10.0,"s2LoopLoadWeight":12.0,"stationPathLenWeightPercent":50.0,"stationPathCongWeightPercent":50.0,"stationPathPassOtherOutStationWeightPercent":100.0,"stationPathPassOtherOutStationForceSkip":false}',
'榛樿妯℃澘'
FROM dual
WHERE NOT EXISTS (
diff --git a/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js b/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
index dda1021..e3c04c2 100644
--- a/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
+++ b/src/main/webapp/static/js/stationPathPolicy/stationPathPolicy.js
@@ -13,6 +13,7 @@
s2BusyWeight: 2.0,
s2QueueWeight: 2.5,
s2WaitWeight: 1.5,
+ s2DeadlockWeight: 8.0,
s2RunBlockWeight: 10.0,
s2LoopLoadWeight: 12.0,
stationPathLenWeightPercent: 50,
diff --git a/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html b/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
index 878caf8..7c24dfe 100644
--- a/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
+++ b/src/main/webapp/views/stationPathPolicy/stationPathPolicy.html
@@ -845,7 +845,7 @@
</div>
<div class="entity-desc">
S1: 闀垮害(s1LenWeight) {{ item.config.s1LenWeight }} / 鎷愮偣(s1TurnWeight) {{ item.config.s1TurnWeight }} / 椤跺崌(s1LiftWeight) {{ item.config.s1LiftWeight }}<br>
- S2: 鎷ュ牭(s2BusyWeight) {{ item.config.s2BusyWeight }} / 鎺掗槦(s2QueueWeight) {{ item.config.s2QueueWeight }} / 绛夊緟(s2WaitWeight) {{ item.config.s2WaitWeight }} / 鍫靛(s2RunBlockWeight) {{ item.config.s2RunBlockWeight }} / 鐜嚎(s2LoopLoadWeight) {{ item.config.s2LoopLoadWeight }}<br>
+ S2: 鎷ュ牭(s2BusyWeight) {{ item.config.s2BusyWeight }} / 鎺掗槦(s2QueueWeight) {{ item.config.s2QueueWeight }} / 绛夊緟(s2WaitWeight) {{ item.config.s2WaitWeight }} / 姝婚攣(s2DeadlockWeight) {{ item.config.s2DeadlockWeight }} / 鍫靛(s2RunBlockWeight) {{ item.config.s2RunBlockWeight }} / 鐜嚎(s2LoopLoadWeight) {{ item.config.s2LoopLoadWeight }}<br>
骞宠 : 闀垮害(stationPathLenWeightPercent) {{ item.config.stationPathLenWeightPercent }}% / 鎵胯浇(stationPathCongWeightPercent) {{ item.config.stationPathCongWeightPercent }}% / 浠栧嚭鎯╃綒(stationPathPassOtherOutStationWeightPercent) {{ item.config.stationPathPassOtherOutStationWeightPercent }} / 寮鸿烦(stationPathPassOtherOutStationForceSkip) {{ item.config.stationPathPassOtherOutStationForceSkip ? '鏄�' : '鍚�' }}
</div>
<div class="entity-actions">
@@ -1081,6 +1081,7 @@
<el-form-item label="鎷ュ牭绋嬪害鏉冮噸(s2BusyWeight)"><el-input-number v-model="profileForm.config.s2BusyWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
<el-form-item label="鎺掗槦閲忔潈閲�(s2QueueWeight)"><el-input-number v-model="profileForm.config.s2QueueWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
<el-form-item label="棰勮绛夊緟鏃堕棿鏉冮噸(s2WaitWeight)"><el-input-number v-model="profileForm.config.s2WaitWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
+ <el-form-item label="姝婚攣椋庨櫓鏉冮噸(s2DeadlockWeight)"><el-input-number v-model="profileForm.config.s2DeadlockWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
<el-form-item label="鍫靛鏉冮噸(s2RunBlockWeight)"><el-input-number v-model="profileForm.config.s2RunBlockWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
<el-form-item label="鐜嚎璐熻浇鏉冮噸(s2LoopLoadWeight)"><el-input-number v-model="profileForm.config.s2LoopLoadWeight" :min="0" :step="0.5" style="width: 100%;"></el-input-number></el-form-item>
</div>
--
Gitblit v1.9.1