From 1699cafdfb76f354882ee5e6142e1b024de32c64 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 四月 2026 13:03:18 +0800
Subject: [PATCH] fix: stop labeling undirected topology as directional
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 151 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index a36d2bc..2dbe19c 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -27,6 +27,7 @@
import com.zy.asrs.service.StationCycleCapacityService;
import com.zy.asrs.service.StationPathPolicyService;
import com.zy.core.News;
+import org.springframework.scheduling.annotation.Scheduled;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
import com.zy.core.enums.StationCommandType;
@@ -55,7 +56,7 @@
public class NavigateUtils {
private static final long STATION_PATH_SLOW_LOG_THRESHOLD_MS = 500L;
- private static final long STATION_PATH_RUNTIME_SNAPSHOT_TTL_MS = 200L;
+ private static final long STATION_PATH_RUNTIME_SNAPSHOT_TTL_MS = 2000L;
private static final double CONGESTION_BUSY_BASE = 1.0d;
private static final double CONGESTION_ISSUED_RESERVE_BASE = 0.75d;
private static final double CONGESTION_PENDING_QUEUE_BASE = 0.45d;
@@ -77,8 +78,23 @@
@Autowired
private StationTaskTraceRegistry stationTaskTraceRegistry;
- private final Object runtimeSnapshotLock = new Object();
private volatile CachedStationPathRuntimeSnapshot cachedRuntimeSnapshot;
+
+ private volatile CachedLoopMergeGuardContext cachedLoopMergeGuardContext;
+
+ @Scheduled(fixedDelay = 1500, initialDelay = 3000)
+ public void refreshStationPathCaches() {
+ try {
+ BaseRuntimeSnapshot snapshot = buildBaseRuntimeSnapshot(null);
+ cachedRuntimeSnapshot = new CachedStationPathRuntimeSnapshot(System.currentTimeMillis(), snapshot);
+ } catch (Exception ignore) {
+ }
+ try {
+ LoopMergeGuardContext context = buildLoopMergeGuardContext();
+ cachedLoopMergeGuardContext = new CachedLoopMergeGuardContext(System.currentTimeMillis(), context);
+ } catch (Exception ignore) {
+ }
+ }
public List<NavigateNode> calcOptimalPathByStationId(Integer startStationId,
Integer endStationId,
@@ -1688,22 +1704,21 @@
}
return cachedSnapshot.baseRuntimeSnapshot.toCacheHitSnapshot();
}
- synchronized (runtimeSnapshotLock) {
- cachedSnapshot = cachedRuntimeSnapshot;
- if (cachedSnapshot != null && now - cachedSnapshot.cacheAtMs <= STATION_PATH_RUNTIME_SNAPSHOT_TTL_MS) {
- if (stepCostMap != null) {
- stepCostMap.put("baseSnapshotCacheHit", 0L);
- }
- return cachedSnapshot.baseRuntimeSnapshot.toCacheHitSnapshot();
- }
- long stepStartNs = System.nanoTime();
- BaseRuntimeSnapshot baseRuntimeSnapshot = buildBaseRuntimeSnapshot(stepCostMap);
+ // 缂撳瓨杩囨湡锛氱敤杩囨湡缂撳瓨鍏滃簳锛園Scheduled 瀹氭椂浠诲姟浼氬緢蹇埛鏂帮級锛岄伩鍏嶅绾跨▼闃诲
+ if (cachedSnapshot != null) {
if (stepCostMap != null) {
- stepCostMap.put("buildBaseSnapshot", elapsedMillis(stepStartNs));
+ stepCostMap.put("baseSnapshotStale", 0L);
}
- cachedRuntimeSnapshot = new CachedStationPathRuntimeSnapshot(now, baseRuntimeSnapshot);
- return baseRuntimeSnapshot;
+ return cachedSnapshot.baseRuntimeSnapshot.toCacheHitSnapshot();
}
+ // 鏋佺鎯呭喌锛氫粠鏈湁杩囩紦瀛橈紙鍚姩棣栨璋冪敤锛夛紝鍚屾鏋勫缓
+ long stepStartNs = System.nanoTime();
+ BaseRuntimeSnapshot baseRuntimeSnapshot = buildBaseRuntimeSnapshot(stepCostMap);
+ if (stepCostMap != null) {
+ stepCostMap.put("buildBaseSnapshot", elapsedMillis(stepStartNs));
+ }
+ cachedRuntimeSnapshot = new CachedStationPathRuntimeSnapshot(System.currentTimeMillis(), baseRuntimeSnapshot);
+ return baseRuntimeSnapshot;
}
private BaseRuntimeSnapshot buildBaseRuntimeSnapshot(Map<String, Long> stepCostMap) {
@@ -1732,7 +1747,7 @@
}
stepStartNs = System.nanoTime();
- List<StationTaskTraceVo> activeTraceList = Collections.unmodifiableList(new ArrayList<>(loadPlanningActiveTraceList(statusMap)));
+ List<StationTaskTraceVo> activeTraceList = Collections.unmodifiableList(new ArrayList<>(loadPlanningActiveTraceList(statusMap, stepCostMap)));
if (stepCostMap != null) {
stepCostMap.put("loadActiveTraceList", elapsedMillis(stepStartNs));
}
@@ -1766,6 +1781,22 @@
}
private LoopMergeGuardContext loadLoopMergeGuardContext() {
+ long now = System.currentTimeMillis();
+ CachedLoopMergeGuardContext cached = cachedLoopMergeGuardContext;
+ if (cached != null && now - cached.cacheAtMs <= STATION_PATH_RUNTIME_SNAPSHOT_TTL_MS) {
+ return new LoopMergeGuardContext(cached.context);
+ }
+ // 缂撳瓨杩囨湡锛氱敤杩囨湡缂撳瓨鍏滃簳锛園Scheduled 瀹氭椂浠诲姟浼氬緢蹇埛鏂帮級
+ if (cached != null) {
+ return new LoopMergeGuardContext(cached.context);
+ }
+ // 鏋佺鎯呭喌锛氫粠鏈湁杩囩紦瀛橈紝鍚屾鏋勫缓
+ LoopMergeGuardContext context = buildLoopMergeGuardContext();
+ cachedLoopMergeGuardContext = new CachedLoopMergeGuardContext(System.currentTimeMillis(), context);
+ return new LoopMergeGuardContext(context);
+ }
+
+ private LoopMergeGuardContext buildLoopMergeGuardContext() {
LoopMergeGuardContext context = new LoopMergeGuardContext();
try {
if (stationCycleCapacityService == null) {
@@ -2138,10 +2169,19 @@
}
private List<StationTaskTraceVo> loadPlanningActiveTraceList(Map<Integer, StationProtocol> statusMap) {
+ return loadPlanningActiveTraceList(statusMap, null);
+ }
+
+ private List<StationTaskTraceVo> loadPlanningActiveTraceList(Map<Integer, StationProtocol> statusMap,
+ Map<String, Long> stepCostMap) {
Map<Integer, StationTaskTraceVo> traceMap = new LinkedHashMap<>();
if (stationTaskTraceRegistry != null) {
try {
- List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listLatestTraces();
+ long stepStartNs = System.nanoTime();
+ List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listPlanningActiveTraceSnapshots();
+ if (stepCostMap != null) {
+ stepCostMap.put("loadRegistryTraces", elapsedMillis(stepStartNs));
+ }
if (traceList != null) {
for (StationTaskTraceVo traceVo : traceList) {
if (!isPlanningActiveTrace(traceVo)) {
@@ -2155,7 +2195,11 @@
} catch (Exception ignore) {
}
}
- Map<Integer, StationTaskTraceVo> fallbackTraceMap = loadFallbackActiveTraceMap(null, statusMap, traceMap.keySet());
+ long stepStartNs = System.nanoTime();
+ Map<Integer, StationTaskTraceVo> fallbackTraceMap = buildProtocolFallbackTraceMap(statusMap, traceMap.keySet());
+ if (stepCostMap != null) {
+ stepCostMap.put("loadFallbackTraces", elapsedMillis(stepStartNs));
+ }
if (!fallbackTraceMap.isEmpty()) {
traceMap.putAll(fallbackTraceMap);
}
@@ -2170,6 +2214,55 @@
return StationTaskTraceRegistry.STATUS_WAITING.equals(status)
|| StationTaskTraceRegistry.STATUS_RUNNING.equals(status)
|| StationTaskTraceRegistry.STATUS_REROUTED.equals(status);
+ }
+
+ private Map<Integer, StationTaskTraceVo> buildProtocolFallbackTraceMap(Map<Integer, StationProtocol> statusMap,
+ Set<Integer> existingTaskNoSet) {
+ if (statusMap == null || statusMap.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ Map<Integer, StationTaskTraceVo> result = new LinkedHashMap<>();
+ for (StationProtocol protocol : statusMap.values()) {
+ if (protocol == null || protocol.getTaskNo() == null || protocol.getTaskNo() <= 0) {
+ continue;
+ }
+ if (!Boolean.TRUE.equals(protocol.isLoading())) {
+ continue;
+ }
+ if (existingTaskNoSet != null && existingTaskNoSet.contains(protocol.getTaskNo())) {
+ continue;
+ }
+ Integer stationId = protocol.getStationId();
+ Integer targetStaNo = protocol.getTargetStaNo();
+ if (stationId == null || targetStaNo == null || stationId.equals(targetStaNo)) {
+ continue;
+ }
+ List<Integer> path = new ArrayList<>();
+ path.add(stationId);
+ path.add(targetStaNo);
+ List<Integer> pendingStationIds = new ArrayList<>();
+ pendingStationIds.add(targetStaNo);
+ StationTaskTraceVo vo = new StationTaskTraceVo();
+ vo.setTaskNo(protocol.getTaskNo());
+ vo.setThreadImpl("PROTOCOL_FALLBACK");
+ vo.setStatus(StationTaskTraceRegistry.STATUS_RUNNING);
+ vo.setTraceVersion(1);
+ vo.setStartStationId(stationId);
+ vo.setCurrentStationId(stationId);
+ vo.setFinalTargetStationId(targetStaNo);
+ vo.setFullPathStationIds(path);
+ vo.setIssuedStationIds(path);
+ vo.setPassedStationIds(Collections.emptyList());
+ vo.setPendingStationIds(pendingStationIds);
+ vo.setLatestIssuedSegmentPath(path);
+ vo.setSegmentList(Collections.emptyList());
+ vo.setIssuedSegmentCount(0);
+ vo.setTotalSegmentCount(1);
+ vo.setUpdatedAt(System.currentTimeMillis());
+ vo.setEvents(Collections.emptyList());
+ result.put(protocol.getTaskNo(), vo);
+ }
+ return result;
}
private Map<Integer, StationTaskTraceVo> loadFallbackActiveTraceMap(Integer currentTaskNo,
@@ -2200,7 +2293,7 @@
}
List<Integer> taskNoList = new ArrayList<>(activeTaskProtocolMap.keySet());
- int limit = Math.max(50, taskNoList.size() * 8);
+ int limit = Math.max(taskNoList.size(), taskNoList.size() * 2);
List<BasStationOpt> optList;
try {
optList = basStationOptService.list(new QueryWrapper<BasStationOpt>()
@@ -3021,6 +3114,16 @@
}
}
+ private static class CachedLoopMergeGuardContext {
+ private final long cacheAtMs;
+ private final LoopMergeGuardContext context;
+
+ private CachedLoopMergeGuardContext(long cacheAtMs, LoopMergeGuardContext context) {
+ this.cacheAtMs = cacheAtMs;
+ this.context = context;
+ }
+ }
+
private static class PathCandidateMetrics {
private List<NavigateNode> path;
private int pathLen;
@@ -3074,6 +3177,16 @@
private static class LoopMergeGuardContext {
private final Set<Integer> loopStationIdSet = new HashSet<>();
private final Map<Integer, Set<Integer>> loopNeighborMap = new HashMap<>();
+
+ private LoopMergeGuardContext() {
+ }
+
+ private LoopMergeGuardContext(LoopMergeGuardContext source) {
+ this.loopStationIdSet.addAll(source.loopStationIdSet);
+ for (Map.Entry<Integer, Set<Integer>> entry : source.loopNeighborMap.entrySet()) {
+ this.loopNeighborMap.put(entry.getKey(), new LinkedHashSet<>(entry.getValue()));
+ }
+ }
}
private static class LoopMergeEntry {
--
Gitblit v1.9.1