From 1ef1063281497f32fcfa4f14b07d99399c0bb765 Mon Sep 17 00:00:00 2001
From: jinglun-cloud <jinglun2019@foxmail.com>
Date: 星期四, 07 五月 2026 15:04:17 +0800
Subject: [PATCH] refactor(设备运动): 重构条码设备运动逻辑，提取运动常量并优化代码结构
---
src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java b/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
index e9eb870..d56af70 100644
--- a/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
+++ b/src/main/java/com/zy/core/trace/StationTaskTraceRegistry.java
@@ -11,6 +11,7 @@
import com.zy.core.model.command.StationCommand;
import com.zy.core.enums.RedisKeyType;
import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -22,6 +23,7 @@
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
+@Slf4j
@Component
public class StationTaskTraceRegistry {
@@ -205,6 +207,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()) {
@@ -277,7 +304,13 @@
if (loadedFromRedis) {
return;
}
+ long redisStartNs = System.nanoTime();
Map<Object, Object> cacheMap = redisUtil == null ? null : redisUtil.hmget(TRACE_CACHE_KEY);
+ long redisCostMs = (System.nanoTime() - redisStartNs) / 1_000_000L;
+ if (redisCostMs > 100) {
+ log.info("StationTaskTraceRegistry Redis鍔犺浇鑰楁椂={}ms, entries={}", redisCostMs,
+ cacheMap == null ? 0 : cacheMap.size());
+ }
if (cacheMap != null && !cacheMap.isEmpty()) {
long now = System.currentTimeMillis();
for (Map.Entry<Object, Object> entry : cacheMap.entrySet()) {
@@ -703,6 +736,24 @@
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;
+ }
+
private synchronized TraceSnapshot toSnapshot() {
TraceSnapshot snapshot = new TraceSnapshot();
snapshot.setTaskNo(taskNo);
--
Gitblit v1.9.1