#

Junjie

18 小时以前 c924d633253a13e01fac86e9fbcffbb7e334e257

#

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -1870,8 +1870,12 @@
        if (session == null || !session.isActive() || session.getLastIssuedAt() == null) {
            return false;
        }
        // 分段执行过程中，刚下发下一段命令时，session 的 currentStationId/dispatchStationId
        // 可能还没来得及和当前观察站点完全对齐；只要当前站点仍在这条活动路线里，
        // 就说明这次 recent dispatch 仍然和它相关，idle 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();

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