From c924d633253a13e01fac86e9fbcffbb7e334e257 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 12:48:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 6 +++++-
src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index df52f38..e86d367 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -1870,8 +1870,12 @@
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())) {
+ && !Objects.equals(stationId, session.getDispatchStationId())
+ && !session.containsStation(stationId)) {
return false;
}
long elapsedMs = System.currentTimeMillis() - session.getLastIssuedAt();
diff --git a/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java b/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
index c67961e..03b41b9 100644
--- a/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
+++ b/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
@@ -219,6 +219,52 @@
}
@Test
+ void idleRecover_skipsWhenCurrentStationIsStillInsideRecentlyIssuedActiveRoute() {
+ StationOperateProcessUtils utils = new StationOperateProcessUtils();
+ StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
+ RedisUtil redisUtil = mock(RedisUtil.class);
+ ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
+ ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
+
+ StationMoveSession session = new StationMoveSession();
+ session.setStatus(StationMoveSession.STATUS_RUNNING);
+ session.setDispatchStationId(196);
+ session.setCurrentStationId(189);
+ session.setFullPathStationIds(List.of(196, 195, 189, 121, 124));
+ session.setLastIssuedAt(System.currentTimeMillis());
+ when(coordinator.loadSession(10510)).thenReturn(session);
+
+ StationCommand command = new StationCommand();
+ command.setTaskNo(10510);
+ command.setStationId(121);
+ command.setTargetStaNo(124);
+
+ StationOperateProcessUtils.RerouteContext context = StationOperateProcessUtils.RerouteContext.create(
+ StationOperateProcessUtils.RerouteSceneType.IDLE_RECOVER,
+ buildBasDevp(1),
+ mock(StationThread.class),
+ buildStationProtocol(121, 10510, 121),
+ buildWrkMast(10510, 124),
+ Collections.emptyList(),
+ 0.0d,
+ "checkStationIdleRecover"
+ ).withRecentDispatchGuard();
+
+ StationOperateProcessUtils.RerouteExecutionResult result = utils.executeReroutePlan(
+ context,
+ StationOperateProcessUtils.RerouteCommandPlan.dispatch(
+ command,
+ StationOperateProcessUtils.RerouteDecision.proceed(124),
+ "checkStationIdleRecover"
+ )
+ );
+
+ assertTrue(result.skipped());
+ assertEquals("recent-dispatch", result.skipReason());
+ verify(coordinator, never()).cancelSession(10510);
+ }
+
+ @Test
void checkStationOutOrder_skipsWhenActiveSessionAlreadyOwnsCurrentStation() {
StationOperateProcessUtils utils = new StationOperateProcessUtils();
BasDevpService basDevpService = mock(BasDevpService.class);
--
Gitblit v1.9.1