From 905eda42c413a5acb0b6ad8a6d19d334b0913383 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Tue, 20 Sep 2022 17:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/simulation/cbtc/data/status/OnboardPisStatus.java | 2 +- .../club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java index 7d01527c1..8537b7851 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java @@ -41,7 +41,7 @@ public class OnboardPisStatus extends Watchable { OnboardPisStatus changeStatus = new OnboardPisStatus(); changeStatus.setGroupNumber(groupNumber); - if (Objects.equals(nextStationName, pis.getNextStationName())) { + if (!Objects.equals(nextStationName, pis.getNextStationName())) { nextStationName = pis.getNextStationName(); change = true; changeStatus.setNextStationName(nextStationName); diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java index fbdb06f05..4ce0e4606 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java @@ -57,7 +57,7 @@ public class PisLogicLoop { if (StringUtils.hasText(nextStandTrackCode)) { Section standTrack = repository.getByCode(nextStandTrackCode, Section.class); List standList = standTrack.getStandList(); - if (!CollectionUtils.isEmpty(standList)) { + if (!CollectionUtils.isEmpty(standList) && !standList.get(0).isSmall()) { nextStation = standList.get(0).getStation(); } }