From aed8dfd97e8979b138cd858f35c15bec898542b3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 13:17:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 55 +++++++++++++++++++--------
src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java | 38 +++++++++++++++++++
2 files changed, 76 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index e86d367..9ab571c 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -1863,32 +1863,53 @@
}
private boolean shouldSkipIdleRecoverForRecentDispatch(Integer taskNo, Integer stationId) {
- if (stationMoveCoordinator == null || taskNo == null || taskNo <= 0 || stationId == null) {
+ if (taskNo == null || taskNo <= 0 || stationId == null) {
return false;
}
- StationMoveSession session = stationMoveCoordinator.loadSession(taskNo);
- if (session == null || !session.isActive() || session.getLastIssuedAt() == null) {
- return false;
- }
- // 鍒嗘鎵ц杩囩▼涓紝鍒氫笅鍙戜笅涓�娈靛懡浠ゆ椂锛宻ession 鐨� currentStationId/dispatchStationId
- // 鍙兘杩樻病鏉ュ緱鍙婂拰褰撳墠瑙傚療绔欑偣瀹屽叏瀵归綈锛涘彧瑕佸綋鍓嶇珯鐐逛粛鍦ㄨ繖鏉℃椿鍔ㄨ矾绾块噷锛�
- // 灏辫鏄庤繖娆� recent dispatch 浠嶇劧鍜屽畠鐩稿叧锛宨dle recover 涓嶅簲鍦� 10 绉掔獥鍙ｅ唴鍐嶆浠嬪叆銆�
- if (!Objects.equals(stationId, session.getCurrentStationId())
- && !Objects.equals(stationId, session.getDispatchStationId())
- && !session.containsStation(stationId)) {
- return false;
- }
- long elapsedMs = System.currentTimeMillis() - session.getLastIssuedAt();
long thresholdMs = STATION_IDLE_RECOVER_SECONDS * 1000L;
- if (elapsedMs >= thresholdMs) {
+ StationMoveSession session = stationMoveCoordinator == null ? null : stationMoveCoordinator.loadSession(taskNo);
+ if (session != null && session.isActive() && session.getLastIssuedAt() != null) {
+ // 鍒嗘鎵ц杩囩▼涓紝鍒氫笅鍙戜笅涓�娈靛懡浠ゆ椂锛宻ession 鐨� currentStationId/dispatchStationId
+ // 鍙兘杩樻病鏉ュ緱鍙婂拰褰撳墠瑙傚療绔欑偣瀹屽叏瀵归綈锛涘彧瑕佸綋鍓嶇珯鐐逛粛鍦ㄨ繖鏉℃椿鍔ㄨ矾绾块噷锛�
+ // 灏辫鏄庤繖娆� recent dispatch 浠嶇劧鍜屽畠鐩稿叧锛宨dle recover 涓嶅簲鍦� 10 绉掔獥鍙ｅ唴鍐嶆浠嬪叆銆�
+ if (Objects.equals(stationId, session.getCurrentStationId())
+ || Objects.equals(stationId, session.getDispatchStationId())
+ || session.containsStation(stationId)) {
+ long elapsedMs = System.currentTimeMillis() - session.getLastIssuedAt();
+ if (elapsedMs < thresholdMs) {
+ saveStationTaskIdleTrack(new StationTaskIdleTrack(taskNo, stationId, System.currentTimeMillis()));
+ News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛涓婃涓嬪彂={}ms锛宺outeVersion={}",
+ stationId, taskNo, elapsedMs, session.getRouteVersion());
+ return true;
+ }
+ }
+ }
+ if (!hasRecentIssuedMoveCommand(taskNo, stationId, thresholdMs)) {
return false;
}
saveStationTaskIdleTrack(new StationTaskIdleTrack(taskNo, stationId, System.currentTimeMillis()));
- News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛涓婃涓嬪彂={}ms锛宺outeVersion={}",
- stationId, taskNo, elapsedMs, session.getRouteVersion());
+ News.info("杈撻�佺珯鐐逛换鍔″垰瀹屾垚鍛戒护涓嬪彂锛屽凡璺宠繃鍋滅暀閲嶇畻銆傜珯鐐瑰彿={}锛屽伐浣滃彿={}锛岃窛鏈�杩戝懡浠や笅鍙�<{}ms锛宺outeVersion={}",
+ stationId, taskNo, thresholdMs, session == null ? null : session.getRouteVersion());
return true;
}
+ private boolean hasRecentIssuedMoveCommand(Integer taskNo, Integer stationId, long thresholdMs) {
+ if (taskNo == null || taskNo <= 0 || stationId == null || thresholdMs <= 0L || basStationOptService == null) {
+ return false;
+ }
+ Date thresholdTime = new Date(System.currentTimeMillis() - thresholdMs);
+ List<BasStationOpt> optList = basStationOptService.list(new QueryWrapper<BasStationOpt>()
+ .select("id")
+ .eq("task_no", taskNo)
+ .eq("station_id", stationId)
+ .eq("mode", String.valueOf(StationCommandType.MOVE))
+ .eq("send", 1)
+ .ge("send_time", thresholdTime)
+ .orderByDesc("send_time")
+ .last("limit 1"));
+ return optList != null && !optList.isEmpty();
+ }
+
private void resetSegmentMoveCommandsBeforeReroute(Integer taskNo) {
if (redisUtil == null || taskNo == null || taskNo <= 0) {
return;
diff --git a/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java b/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
index 03b41b9..d9163cf 100644
--- a/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
+++ b/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
@@ -1,8 +1,10 @@
package com.zy.core.utils;
+import com.zy.asrs.entity.BasStationOpt;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasStationOptService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.WrkAnalysisService;
import com.zy.asrs.utils.NotifyUtils;
@@ -25,6 +27,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
+import java.util.Date;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -265,6 +268,41 @@
}
@Test
+ void idleRecover_skipsWhenStationCommandLogShowsRecentIssuedMove() {
+ StationOperateProcessUtils utils = new StationOperateProcessUtils();
+ StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
+ BasStationOptService basStationOptService = mock(BasStationOptService.class);
+ RedisUtil redisUtil = mock(RedisUtil.class);
+ ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
+ ReflectionTestUtils.setField(utils, "basStationOptService", basStationOptService);
+ ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
+
+ StationMoveSession session = new StationMoveSession();
+ session.setStatus(StationMoveSession.STATUS_RUNNING);
+ session.setDispatchStationId(136);
+ session.setCurrentStationId(145);
+ session.setFullPathStationIds(List.of(136, 137, 139, 142, 143, 145, 148, 149, 151));
+ session.setLastIssuedAt(System.currentTimeMillis() - 20_000L);
+ when(coordinator.loadSession(10493)).thenReturn(session);
+
+ BasStationOpt recentOpt = new BasStationOpt();
+ recentOpt.setTaskNo(10493);
+ recentOpt.setStationId(148);
+ recentOpt.setSend(1);
+ recentOpt.setMode(String.valueOf(com.zy.core.enums.StationCommandType.MOVE));
+ recentOpt.setSendTime(new Date());
+ when(basStationOptService.list(any(com.baomidou.mybatisplus.core.conditions.Wrapper.class)))
+ .thenReturn(Collections.singletonList(recentOpt));
+
+ Boolean skipped = ReflectionTestUtils.invokeMethod(utils,
+ "shouldSkipIdleRecoverForRecentDispatch",
+ 10493,
+ 148);
+
+ assertTrue(Boolean.TRUE.equals(skipped));
+ }
+
+ @Test
void checkStationOutOrder_skipsWhenActiveSessionAlreadyOwnsCurrentStation() {
StationOperateProcessUtils utils = new StationOperateProcessUtils();
BasDevpService basDevpService = mock(BasDevpService.class);
--
Gitblit v1.9.1