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 | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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..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;
@@ -1701,7 +1701,7 @@
if (stepCostMap != null) {
stepCostMap.put("buildBaseSnapshot", elapsedMillis(stepStartNs));
}
- cachedRuntimeSnapshot = new CachedStationPathRuntimeSnapshot(now, baseRuntimeSnapshot);
+ cachedRuntimeSnapshot = new CachedStationPathRuntimeSnapshot(System.currentTimeMillis(), baseRuntimeSnapshot);
return baseRuntimeSnapshot;
}
}
@@ -1732,7 +1732,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));
}
@@ -2138,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)) {
@@ -2155,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);
}
@@ -2200,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>()
--
Gitblit v1.9.1