From 3adcbff31fdece77269744c8741f237e7a57348e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 22 三月 2026 17:17:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java b/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
index d76b8f3..e9eb870 100644
--- a/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
+++ b/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
@@ -259,7 +259,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);
}
@@ -619,9 +619,6 @@
}
this.status = terminalStatus;
this.blockedStationId = blockedStationId;
- if (shouldClearPathOnTerminal(terminalStatus)) {
- clearPathState();
- }
this.updatedAt = System.currentTimeMillis();
this.terminalExpireAt = this.updatedAt + TERMINAL_KEEP_MS;
@@ -640,12 +637,12 @@
Map<String, Object> details) {
boolean active = Boolean.TRUE.equals(loopAlertActive)
&& loopAlertCount != null
- && loopAlertCount > 1
+ && loopAlertCount > 2
&& loopAlertText != null
&& !loopAlertText.trim().isEmpty();
String nextType = active ? loopAlertType : null;
String nextText = active ? loopAlertText.trim() : null;
- Integer nextCount = active ? loopAlertCount : 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)
@@ -669,22 +666,6 @@
nextDetails.put("loopAlertText", this.loopAlertText);
nextDetails.put("loopAlertCount", this.loopAlertCount);
appendEvent("LOOP_REPEAT_ALERT", this.loopAlertText, 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 boolean shouldClearPathOnTerminal(String terminalStatus) {
- return STATUS_BLOCKED.equals(terminalStatus)
- || STATUS_CANCELLED.equals(terminalStatus);
}
private synchronized boolean shouldRemove(long now) {
@@ -829,13 +810,15 @@
}
private void appendLoopHintDetails(Map<String, Object> details) {
- if (details == null || !Boolean.TRUE.equals(this.loopAlertActive) || this.loopAlertCount == null || this.loopAlertCount <= 1) {
+ if (details == null || this.loopAlertCount == null || this.loopAlertCount <= 0) {
return;
}
- details.put("loopAlertActive", Boolean.TRUE);
- details.put("loopAlertType", this.loopAlertType);
- details.put("loopAlertText", this.loopAlertText);
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) {
--
Gitblit v1.9.1