From 26784989e73fc36c6315e54939d1b13a50eb5020 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 三月 2026 21:03:00 +0800
Subject: [PATCH] #

---
 src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java b/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
index d9163cf..8abda6e 100644
--- a/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
+++ b/src/test/java/com/zy/core/utils/StationOperateProcessUtilsReroutePipelineTest.java
@@ -2,8 +2,10 @@
 
 import com.zy.asrs.entity.BasStationOpt;
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasStation;
 import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasStationService;
 import com.zy.asrs.service.BasStationOptService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.service.WrkAnalysisService;
@@ -42,12 +44,21 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 class StationOperateProcessUtilsReroutePipelineTest {
+
+    @SuppressWarnings("unchecked")
+    private void stubTaskDispatchLock(StationMoveCoordinator coordinator) {
+        when(coordinator.withTaskDispatchLock(any(), any())).thenAnswer(invocation -> {
+            java.util.function.Supplier<Object> supplier = invocation.getArgument(1);
+            return supplier == null ? null : supplier.get();
+        });
+    }
 
     @Test
     void choosesRunBlockCommandBuilderForRunBlockRerouteScene() {
@@ -181,6 +192,7 @@
         StationOperateProcessUtils utils = new StationOperateProcessUtils();
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
+        stubTaskDispatchLock(coordinator);
         ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
         ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
 
@@ -226,6 +238,7 @@
         StationOperateProcessUtils utils = new StationOperateProcessUtils();
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
+        stubTaskDispatchLock(coordinator);
         ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
         ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
 
@@ -273,6 +286,7 @@
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         BasStationOptService basStationOptService = mock(BasStationOptService.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
+        stubTaskDispatchLock(coordinator);
         ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
         ReflectionTestUtils.setField(utils, "basStationOptService", basStationOptService);
         ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
@@ -310,6 +324,7 @@
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
         StationThread stationThread = mock(StationThread.class);
+        stubTaskDispatchLock(coordinator);
 
         ReflectionTestUtils.setField(utils, "basDevpService", basDevpService);
         ReflectionTestUtils.setField(utils, "wrkMastService", wrkMastService);
@@ -371,6 +386,7 @@
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
         StationThread stationThread = mock(StationThread.class);
+        stubTaskDispatchLock(coordinator);
 
         ReflectionTestUtils.setField(utils, "basDevpService", basDevpService);
         ReflectionTestUtils.setField(utils, "wrkMastService", wrkMastService);
@@ -479,7 +495,10 @@
     void executePlan_runBlockReroute_reissuesWhenBlockedSessionMatchesCandidatePath() {
         StationOperateProcessUtils utils = new StationOperateProcessUtils();
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
+        RedisUtil redisUtil = mock(RedisUtil.class);
+        stubTaskDispatchLock(coordinator);
         ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
+        ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
 
         StationCommand command = new StationCommand();
         command.setTaskNo(100);
@@ -521,6 +540,9 @@
             );
 
             assertTrue(!result.skipped());
+            org.mockito.InOrder inOrder = inOrder(coordinator);
+            inOrder.verify(coordinator).markCancelPending(100, "reroute_pending");
+            inOrder.verify(coordinator).cancelSession(100);
             verify(coordinator, times(1)).cancelSession(100);
         } finally {
             MessageQueue.clear(SlaveType.Devp, 1);
@@ -532,6 +554,7 @@
         StationOperateProcessUtils utils = new StationOperateProcessUtils();
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
+        stubTaskDispatchLock(coordinator);
         ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
         ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
 
@@ -582,6 +605,7 @@
         StationOperateProcessUtils utils = new StationOperateProcessUtils();
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
+        stubTaskDispatchLock(coordinator);
         ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
         ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
 
@@ -636,6 +660,7 @@
         WrkAnalysisService wrkAnalysisService = mock(WrkAnalysisService.class);
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         StationThread stationThread = mock(StationThread.class);
+        stubTaskDispatchLock(coordinator);
 
         ReflectionTestUtils.setField(utils, "basDevpService", basDevpService);
         ReflectionTestUtils.setField(utils, "wrkMastService", wrkMastService);
@@ -696,6 +721,7 @@
         NotifyUtils notifyUtils = mock(NotifyUtils.class);
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         StationThread stationThread = mock(StationThread.class);
+        stubTaskDispatchLock(coordinator);
 
         ReflectionTestUtils.setField(utils, "wrkMastService", wrkMastService);
         ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
@@ -742,6 +768,53 @@
     }
 
     @Test
+    void stationOutExecuteFinish_attemptsClearPathBeforeCompletingTask() {
+        StationOperateProcessUtils utils = new StationOperateProcessUtils();
+        WrkMastService wrkMastService = mock(WrkMastService.class);
+        BasStationService basStationService = mock(BasStationService.class);
+        WrkAnalysisService wrkAnalysisService = mock(WrkAnalysisService.class);
+        NotifyUtils notifyUtils = mock(NotifyUtils.class);
+        RedisUtil redisUtil = mock(RedisUtil.class);
+        StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
+        StationThread stationThread = mock(StationThread.class);
+
+        ReflectionTestUtils.setField(utils, "wrkMastService", wrkMastService);
+        ReflectionTestUtils.setField(utils, "basStationService", basStationService);
+        ReflectionTestUtils.setField(utils, "wrkAnalysisService", wrkAnalysisService);
+        ReflectionTestUtils.setField(utils, "notifyUtils", notifyUtils);
+        ReflectionTestUtils.setField(utils, "redisUtil", redisUtil);
+        ReflectionTestUtils.setField(utils, "stationMoveCoordinator", coordinator);
+
+        WrkMast wrkMast = buildWrkMast(10335, 145);
+        wrkMast.setWrkSts(WrkStsType.STATION_RUN.sts);
+        when(wrkMastService.list(any(com.baomidou.mybatisplus.core.conditions.Wrapper.class)))
+                .thenReturn(Collections.singletonList(wrkMast));
+        when(wrkMastService.updateById(wrkMast)).thenReturn(true);
+
+        BasStation basStation = new BasStation();
+        basStation.setStationId(145);
+        basStation.setDeviceNo(1);
+        when(basStationService.getOne(any(com.baomidou.mybatisplus.core.conditions.Wrapper.class)))
+                .thenReturn(basStation);
+
+        StationProtocol stationProtocol = buildStationProtocol(145, 10335, 145);
+        when(stationThread.getStatusMap()).thenReturn(Map.of(145, stationProtocol));
+        when(stationThread.clearPath(10335)).thenReturn(true);
+
+        SlaveConnection.put(SlaveType.Devp, 1, stationThread);
+        try {
+            utils.stationOutExecuteFinish();
+
+            verify(stationThread, times(1)).clearPath(10335);
+            verify(coordinator, times(1)).finishSession(10335);
+            verify(wrkMastService, times(1)).updateById(wrkMast);
+            assertEquals(WrkStsType.STATION_RUN_COMPLETE.sts, wrkMast.getWrkSts());
+        } finally {
+            SlaveConnection.remove(SlaveType.Devp, 1);
+        }
+    }
+
+    @Test
     void watchCircleStation_usesSessionArrivalStateWhenLegacyCommandMissing() {
         StationOperateProcessUtils utils = new StationOperateProcessUtils();
         BasDevpService basDevpService = mock(BasDevpService.class);
@@ -749,6 +822,7 @@
         StationMoveCoordinator coordinator = mock(StationMoveCoordinator.class);
         RedisUtil redisUtil = mock(RedisUtil.class);
         StationThread stationThread = mock(StationThread.class);
+        stubTaskDispatchLock(coordinator);
 
         ReflectionTestUtils.setField(utils, "basDevpService", basDevpService);
         ReflectionTestUtils.setField(utils, "wrkMastService", wrkMastService);

--
Gitblit v1.9.1