From 89433d782a834ae4ab1835a0b70fa16340bbbd49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 四月 2026 19:41:20 +0800
Subject: [PATCH] #算法耗时优化
---
src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 148 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java b/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
index 8cfca63..c366e70 100644
--- a/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
+++ b/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
@@ -152,6 +152,21 @@
persistState(state);
}
+ public void updateLoopHint(Integer taskNo,
+ Boolean loopAlertActive,
+ String loopAlertType,
+ String loopAlertText,
+ Integer loopAlertCount,
+ Map<String, Object> details) {
+ ensureCacheLoaded();
+ TraceTaskState state = taskStateMap.get(taskNo);
+ if (state == null) {
+ return;
+ }
+ state.updateLoopHint(loopAlertActive, loopAlertType, loopAlertText, loopAlertCount, details);
+ persistState(state);
+ }
+
public List<StationTaskTraceVo> listLatestTraces() {
ensureCacheLoaded();
cleanupExpired();
@@ -190,6 +205,31 @@
return result;
}
+ public List<StationTaskTraceVo> listPlanningActiveTraceSnapshots() {
+ ensureCacheLoaded();
+ cleanupExpired();
+ List<StationTaskTraceVo> result = new ArrayList<>();
+ for (TraceTaskState state : taskStateMap.values()) {
+ if (state == null) {
+ continue;
+ }
+ StationTaskTraceVo traceVo = state.toPlanningVo();
+ if (traceVo == null) {
+ continue;
+ }
+ result.add(traceVo);
+ }
+ result.sort(new Comparator<StationTaskTraceVo>() {
+ @Override
+ public int compare(StationTaskTraceVo a, StationTaskTraceVo b) {
+ long av = a.getUpdatedAt() == null ? 0L : a.getUpdatedAt();
+ long bv = b.getUpdatedAt() == null ? 0L : b.getUpdatedAt();
+ return Long.compare(bv, av);
+ }
+ });
+ return result;
+ }
+
private void cleanupExpired() {
long now = System.currentTimeMillis();
for (Map.Entry<Integer, TraceTaskState> entry : taskStateMap.entrySet()) {
@@ -215,7 +255,16 @@
} catch (Exception ignore) {
continue;
}
- if (wrkMast == null || isStationTraceActiveWrkStatus(wrkMast.getWrkSts())) {
+ if (wrkMast == null) {
+ Integer currentStationId = state.currentStationId != null ? state.currentStationId : state.finalTargetStationId;
+ Map<String, Object> details = new LinkedHashMap<>();
+ details.put("reason", "wrk_missing");
+ state.markTerminal(state.traceVersion, STATUS_FINISHED, currentStationId, null,
+ "AUTO_FINISHED", "杈撻�佷换鍔℃。宸蹭笉瀛樺湪锛岃建杩硅嚜鍔ㄧ粨鏉�", details);
+ persistState(state);
+ continue;
+ }
+ if (isStationTraceActiveWrkStatus(wrkMast.getWrkSts())) {
continue;
}
Integer currentStationId = state.currentStationId != null ? state.currentStationId : state.finalTargetStationId;
@@ -235,7 +284,7 @@
}
private boolean isStationTraceActiveWrkStatus(Long wrkSts) {
- return Objects.equals(wrkSts, WrkStsType.INBOUND_DEVICE_RUN.sts)
+ return Objects.equals(wrkSts, WrkStsType.INBOUND_STATION_RUN.sts)
|| Objects.equals(wrkSts, WrkStsType.STATION_RUN.sts);
}
@@ -426,6 +475,10 @@
private List<StationTaskTraceSegmentVo> segmentList = new ArrayList<>();
private Integer issuedSegmentCount;
private Integer totalSegmentCount;
+ private Boolean loopAlertActive;
+ private String loopAlertType;
+ private String loopAlertText;
+ private Integer loopAlertCount;
private Long updatedAt;
private Long terminalExpireAt;
private List<StationTaskTraceEventVo> events = new ArrayList<>();
@@ -453,6 +506,10 @@
private List<StationTaskTraceSegmentVo> segmentList = new ArrayList<>();
private Integer issuedSegmentCount = 0;
private Integer totalSegmentCount = 0;
+ private Boolean loopAlertActive = Boolean.FALSE;
+ private String loopAlertType;
+ private String loopAlertText;
+ private Integer loopAlertCount;
private final List<StationTaskTraceEventVo> events = new ArrayList<>();
private Long updatedAt = System.currentTimeMillis();
private Long terminalExpireAt;
@@ -468,6 +525,7 @@
List<Integer> localPathStationIds,
List<StationTaskTraceSegmentVo> localSegmentList) {
TraceRegistration registration = new TraceRegistration();
+ boolean firstPlan = this.traceVersion == null || this.traceVersion <= 0;
boolean rerouted = !isTerminalStatus(this.status) && this.traceVersion != null && this.traceVersion > 0;
int nextTraceVersion = rerouted ? this.traceVersion + 1 : 1;
int pathOffset = rerouted ? this.passedStationIds.size() : 0;
@@ -489,6 +547,9 @@
this.latestIssuedSegmentPath = new ArrayList<>();
this.status = rerouted ? STATUS_REROUTED : STATUS_WAITING;
this.terminalExpireAt = null;
+ if (firstPlan) {
+ clearLoopHintState();
+ }
rebuildProgress(planCurrentStationId);
this.updatedAt = System.currentTimeMillis();
@@ -498,6 +559,7 @@
details.put("segmentCount", this.totalSegmentCount);
details.put("pathOffset", pathOffset);
details.put("currentStationId", this.currentStationId);
+ appendLoopHintDetails(details);
appendEvent(rerouted ? "REROUTED" : "PLAN_READY",
rerouted ? "杈撻�佷换鍔¤矾寰勫凡閲嶇畻骞剁画鎺ヨ建杩�" : "杈撻�佷换鍔″垎娈佃鍒掑凡寤虹珛",
details);
@@ -582,9 +644,6 @@
}
this.status = terminalStatus;
this.blockedStationId = blockedStationId;
- if (shouldClearPathOnTerminal(terminalStatus)) {
- clearPathState();
- }
this.updatedAt = System.currentTimeMillis();
this.terminalExpireAt = this.updatedAt + TERMINAL_KEEP_MS;
@@ -596,20 +655,42 @@
appendEvent(eventType, message, nextDetails);
}
- private void clearPathState() {
- this.fullPathStationIds = new ArrayList<>();
- this.issuedStationIds = new ArrayList<>();
- this.passedStationIds = new ArrayList<>();
- this.pendingStationIds = new ArrayList<>();
- this.latestIssuedSegmentPath = new ArrayList<>();
- this.segmentList = new ArrayList<>();
- this.issuedSegmentCount = 0;
- this.totalSegmentCount = 0;
- }
+ private synchronized void updateLoopHint(Boolean loopAlertActive,
+ String loopAlertType,
+ String loopAlertText,
+ Integer loopAlertCount,
+ Map<String, Object> details) {
+ boolean active = Boolean.TRUE.equals(loopAlertActive)
+ && loopAlertCount != null
+ && loopAlertCount > 2
+ && loopAlertText != null
+ && !loopAlertText.trim().isEmpty();
+ String nextType = active ? loopAlertType : null;
+ String nextText = active ? loopAlertText.trim() : null;
+ Integer nextCount = loopAlertCount != null && loopAlertCount > 0 ? loopAlertCount : null;
+ boolean changed = !Objects.equals(this.loopAlertActive, active)
+ || !Objects.equals(this.loopAlertType, nextType)
+ || !Objects.equals(this.loopAlertText, nextText)
+ || !Objects.equals(this.loopAlertCount, nextCount);
+ if (!changed) {
+ return;
+ }
- private boolean shouldClearPathOnTerminal(String terminalStatus) {
- return STATUS_BLOCKED.equals(terminalStatus)
- || STATUS_CANCELLED.equals(terminalStatus);
+ this.loopAlertActive = active;
+ this.loopAlertType = nextType;
+ this.loopAlertText = nextText;
+ this.loopAlertCount = nextCount;
+ this.updatedAt = System.currentTimeMillis();
+ if (!active) {
+ return;
+ }
+
+ Map<String, Object> nextDetails = copyDetails(details);
+ nextDetails.put("loopAlertActive", Boolean.TRUE);
+ nextDetails.put("loopAlertType", this.loopAlertType);
+ nextDetails.put("loopAlertText", this.loopAlertText);
+ nextDetails.put("loopAlertCount", this.loopAlertCount);
+ appendEvent("LOOP_REPEAT_ALERT", this.loopAlertText, nextDetails);
}
private synchronized boolean shouldRemove(long now) {
@@ -638,8 +719,30 @@
vo.setSegmentList(copySegmentListWithIssued(segmentList, issuedSegmentCount));
vo.setIssuedSegmentCount(issuedSegmentCount);
vo.setTotalSegmentCount(totalSegmentCount);
+ vo.setLoopAlertActive(loopAlertActive);
+ vo.setLoopAlertType(loopAlertType);
+ vo.setLoopAlertText(loopAlertText);
+ vo.setLoopAlertCount(loopAlertCount);
vo.setUpdatedAt(updatedAt);
vo.setEvents(copyEventList(events));
+ return vo;
+ }
+
+ private synchronized StationTaskTraceVo toPlanningVo() {
+ if (isTerminalStatus(this.status)) {
+ return null;
+ }
+ StationTaskTraceVo vo = new StationTaskTraceVo();
+ vo.setTaskNo(taskNo);
+ vo.setThreadImpl(threadImpl);
+ vo.setStatus(status);
+ vo.setTraceVersion(traceVersion);
+ vo.setStartStationId(startStationId);
+ vo.setCurrentStationId(currentStationId);
+ vo.setFinalTargetStationId(finalTargetStationId);
+ vo.setPendingStationIds(copyIntegerList(pendingStationIds));
+ vo.setLatestIssuedSegmentPath(copyIntegerList(latestIssuedSegmentPath));
+ vo.setUpdatedAt(updatedAt);
return vo;
}
@@ -661,6 +764,10 @@
snapshot.setSegmentList(copySegmentList(segmentList));
snapshot.setIssuedSegmentCount(issuedSegmentCount);
snapshot.setTotalSegmentCount(totalSegmentCount);
+ snapshot.setLoopAlertActive(loopAlertActive);
+ snapshot.setLoopAlertType(loopAlertType);
+ snapshot.setLoopAlertText(loopAlertText);
+ snapshot.setLoopAlertCount(loopAlertCount);
snapshot.setUpdatedAt(updatedAt);
snapshot.setTerminalExpireAt(terminalExpireAt);
snapshot.setEvents(copyEventList(events));
@@ -684,6 +791,10 @@
state.segmentList = copySegmentList(snapshot.getSegmentList());
state.issuedSegmentCount = snapshot.getIssuedSegmentCount() == null ? 0 : snapshot.getIssuedSegmentCount();
state.totalSegmentCount = snapshot.getTotalSegmentCount() == null ? state.segmentList.size() : snapshot.getTotalSegmentCount();
+ state.loopAlertActive = Boolean.TRUE.equals(snapshot.getLoopAlertActive());
+ state.loopAlertType = snapshot.getLoopAlertType();
+ state.loopAlertText = snapshot.getLoopAlertText();
+ state.loopAlertCount = snapshot.getLoopAlertCount();
state.updatedAt = snapshot.getUpdatedAt() == null ? System.currentTimeMillis() : snapshot.getUpdatedAt();
state.terminalExpireAt = snapshot.getTerminalExpireAt();
state.events.clear();
@@ -734,6 +845,25 @@
this.pendingStationIds = copyIntegerList(fullPath.subList(currentIndex + 1, fullPath.size()));
}
+ private void clearLoopHintState() {
+ this.loopAlertActive = Boolean.FALSE;
+ this.loopAlertType = null;
+ this.loopAlertText = null;
+ this.loopAlertCount = null;
+ }
+
+ private void appendLoopHintDetails(Map<String, Object> details) {
+ if (details == null || this.loopAlertCount == null || this.loopAlertCount <= 0) {
+ return;
+ }
+ details.put("loopAlertCount", this.loopAlertCount);
+ if (Boolean.TRUE.equals(this.loopAlertActive)) {
+ details.put("loopAlertActive", Boolean.TRUE);
+ details.put("loopAlertType", this.loopAlertType);
+ details.put("loopAlertText", this.loopAlertText);
+ }
+ }
+
private boolean acceptTraceVersion(Integer incomingTraceVersion) {
return incomingTraceVersion != null
&& this.traceVersion != null
--
Gitblit v1.9.1