#

Junjie

21 小时以前 f7419832fc4895d15b2d7b3b0ce30edb4b374fbd

#

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -293,7 +293,7 @@
    @PostMapping("/latest/data/station/trace")
    @ManagerAuth(memo = "输送任务轨迹实时数据")
    public R stationTaskTraceLatestData() {
        List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listActiveTraces();
        List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listLatestTraces();
        return R.ok().add(traceList);
    }


 src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java

@@ -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;

@@ -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) {