From 549223100aa6f2ffe6cbf7955de36a8a0155a8cd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 20:03:23 +0800
Subject: [PATCH] #算法耗时优化
---
src/main/java/com/zy/common/utils/NavigateUtils.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 97 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateUtils.java b/src/main/java/com/zy/common/utils/NavigateUtils.java
index 449e7aa..5614e6c 100644
--- a/src/main/java/com/zy/common/utils/NavigateUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateUtils.java
@@ -55,7 +55,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;
@@ -1651,15 +1651,25 @@
}
private StationPathRuntimeSnapshot loadStationPathRuntimeSnapshot(Integer currentTaskNo) {
- BaseRuntimeSnapshot baseRuntimeSnapshot = loadBaseRuntimeSnapshot();
+ long totalStartNs = System.nanoTime();
+ Map<String, Long> stepCostMap = new LinkedHashMap<>();
+
+ long stepStartNs = System.nanoTime();
+ BaseRuntimeSnapshot baseRuntimeSnapshot = loadBaseRuntimeSnapshot(stepCostMap);
+ stepCostMap.put("loadBaseSnapshot", elapsedMillis(stepStartNs));
if (baseRuntimeSnapshot == null) {
+ logRuntimeSnapshotSlow(currentTaskNo, false, stepCostMap, totalStartNs);
return StationPathRuntimeSnapshot.empty();
}
+
+ stepStartNs = System.nanoTime();
StationTrafficSnapshot trafficSnapshot = buildStationTrafficSnapshot(
baseRuntimeSnapshot.statusMap,
currentTaskNo,
baseRuntimeSnapshot.activeTraceList
);
+ stepCostMap.put("buildTrafficSnapshot", elapsedMillis(stepStartNs));
+ logRuntimeSnapshotSlow(currentTaskNo, baseRuntimeSnapshot.cacheHit, stepCostMap, totalStartNs);
return new StationPathRuntimeSnapshot(
baseRuntimeSnapshot.statusMap,
baseRuntimeSnapshot.stationLoopLoadMap,
@@ -1669,30 +1679,64 @@
);
}
- private BaseRuntimeSnapshot loadBaseRuntimeSnapshot() {
+ private BaseRuntimeSnapshot loadBaseRuntimeSnapshot(Map<String, Long> stepCostMap) {
long now = System.currentTimeMillis();
CachedStationPathRuntimeSnapshot cachedSnapshot = cachedRuntimeSnapshot;
if (cachedSnapshot != null && now - cachedSnapshot.cacheAtMs <= STATION_PATH_RUNTIME_SNAPSHOT_TTL_MS) {
- return cachedSnapshot.baseRuntimeSnapshot;
+ if (stepCostMap != null) {
+ stepCostMap.put("baseSnapshotCacheHit", 0L);
+ }
+ return cachedSnapshot.baseRuntimeSnapshot.toCacheHitSnapshot();
}
synchronized (runtimeSnapshotLock) {
cachedSnapshot = cachedRuntimeSnapshot;
if (cachedSnapshot != null && now - cachedSnapshot.cacheAtMs <= STATION_PATH_RUNTIME_SNAPSHOT_TTL_MS) {
- return cachedSnapshot.baseRuntimeSnapshot;
+ if (stepCostMap != null) {
+ stepCostMap.put("baseSnapshotCacheHit", 0L);
+ }
+ return cachedSnapshot.baseRuntimeSnapshot.toCacheHitSnapshot();
}
- BaseRuntimeSnapshot baseRuntimeSnapshot = buildBaseRuntimeSnapshot();
- cachedRuntimeSnapshot = new CachedStationPathRuntimeSnapshot(now, baseRuntimeSnapshot);
+ 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() {
+ private BaseRuntimeSnapshot buildBaseRuntimeSnapshot(Map<String, Long> stepCostMap) {
+ long stepStartNs = System.nanoTime();
Map<Integer, StationProtocol> statusMap = Collections.unmodifiableMap(new LinkedHashMap<>(loadStationStatusMap()));
+ if (stepCostMap != null) {
+ stepCostMap.put("loadStatusMap", elapsedMillis(stepStartNs));
+ }
+
+ stepStartNs = System.nanoTime();
Map<Integer, Double> stationLoopLoadMap = Collections.unmodifiableMap(new LinkedHashMap<>(loadStationLoopLoadMap()));
+ if (stepCostMap != null) {
+ stepCostMap.put("loadLoopLoadMap", elapsedMillis(stepStartNs));
+ }
+
+ stepStartNs = System.nanoTime();
LoopMergeGuardContext loopMergeGuardContext = loadLoopMergeGuardContext();
+ if (stepCostMap != null) {
+ stepCostMap.put("loadLoopMergeGuard", elapsedMillis(stepStartNs));
+ }
+
+ stepStartNs = System.nanoTime();
Set<Integer> outStationIdSet = Collections.unmodifiableSet(new LinkedHashSet<>(loadAllOutStationIdSet()));
- List<StationTaskTraceVo> activeTraceList = Collections.unmodifiableList(new ArrayList<>(loadPlanningActiveTraceList(statusMap)));
- return new BaseRuntimeSnapshot(statusMap, stationLoopLoadMap, loopMergeGuardContext, outStationIdSet, activeTraceList);
+ if (stepCostMap != null) {
+ stepCostMap.put("loadOutStationSet", elapsedMillis(stepStartNs));
+ }
+
+ stepStartNs = System.nanoTime();
+ List<StationTaskTraceVo> activeTraceList = Collections.unmodifiableList(new ArrayList<>(loadPlanningActiveTraceList(statusMap, stepCostMap)));
+ if (stepCostMap != null) {
+ stepCostMap.put("loadActiveTraceList", elapsedMillis(stepStartNs));
+ }
+ return new BaseRuntimeSnapshot(false, statusMap, stationLoopLoadMap, loopMergeGuardContext, outStationIdSet, activeTraceList);
}
private Map<Integer, Double> loadStationLoopLoadMap() {
@@ -2094,10 +2138,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)) {
@@ -2111,7 +2164,11 @@
} catch (Exception ignore) {
}
}
+ long stepStartNs = System.nanoTime();
Map<Integer, StationTaskTraceVo> fallbackTraceMap = loadFallbackActiveTraceMap(null, statusMap, traceMap.keySet());
+ if (stepCostMap != null) {
+ stepCostMap.put("loadFallbackTraces", elapsedMillis(stepStartNs));
+ }
if (!fallbackTraceMap.isEmpty()) {
traceMap.putAll(fallbackTraceMap);
}
@@ -2156,7 +2213,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>()
@@ -2719,6 +2776,21 @@
totalCostMs);
}
+ private void logRuntimeSnapshotSlow(Integer currentTaskNo,
+ boolean cacheHit,
+ Map<String, Long> stepCostMap,
+ long totalStartNs) {
+ long totalCostMs = elapsedMillis(totalStartNs);
+ if (totalCostMs < STATION_PATH_SLOW_LOG_THRESHOLD_MS) {
+ return;
+ }
+ News.warn("绔欑偣璺緞杩愯鏃跺揩鐓у姞杞借�楁椂杈冮暱锛宼askNo={}锛宑acheHit={}锛宻tepCosts={}锛宼otalCost={}ms",
+ currentTaskNo,
+ cacheHit,
+ JSON.toJSONString(stepCostMap),
+ totalCostMs);
+ }
+
private long elapsedMillis(long startNs) {
long elapsedNs = System.nanoTime() - startNs;
return elapsedNs <= 0L ? 0L : elapsedNs / 1_000_000L;
@@ -2921,23 +2993,35 @@
}
private static class BaseRuntimeSnapshot {
+ private final boolean cacheHit;
private final Map<Integer, StationProtocol> statusMap;
private final Map<Integer, Double> stationLoopLoadMap;
private final LoopMergeGuardContext loopMergeGuardContext;
private final Set<Integer> outStationIdSet;
private final List<StationTaskTraceVo> activeTraceList;
- private BaseRuntimeSnapshot(Map<Integer, StationProtocol> statusMap,
+ private BaseRuntimeSnapshot(boolean cacheHit,
+ Map<Integer, StationProtocol> statusMap,
Map<Integer, Double> stationLoopLoadMap,
LoopMergeGuardContext loopMergeGuardContext,
Set<Integer> outStationIdSet,
List<StationTaskTraceVo> activeTraceList) {
+ this.cacheHit = cacheHit;
this.statusMap = statusMap == null ? Collections.emptyMap() : statusMap;
this.stationLoopLoadMap = stationLoopLoadMap == null ? Collections.emptyMap() : stationLoopLoadMap;
this.loopMergeGuardContext = loopMergeGuardContext == null ? new LoopMergeGuardContext() : loopMergeGuardContext;
this.outStationIdSet = outStationIdSet == null ? Collections.emptySet() : outStationIdSet;
this.activeTraceList = activeTraceList == null ? Collections.emptyList() : activeTraceList;
}
+
+ private BaseRuntimeSnapshot toCacheHitSnapshot() {
+ return new BaseRuntimeSnapshot(true,
+ statusMap,
+ stationLoopLoadMap,
+ loopMergeGuardContext,
+ outStationIdSet,
+ activeTraceList);
+ }
}
private static class CachedStationPathRuntimeSnapshot {
--
Gitblit v1.9.1