From 9abcd2fc4f3cd3bf2b6227b0a19308f0ef1c9a6b Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 30 Aug 2021 11:11:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E4=BA=BA=E5=B7=A5=E8=BD=A6=E3=80=81?= =?UTF-8?q?=E5=A4=B4=E7=A0=81=E8=BD=A6=20=E6=97=A9=E6=99=9A=E7=82=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java index bf00fdc54..ffc273149 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java @@ -498,9 +498,11 @@ public class TrainInfo extends MapElement { this.actualArriveStandTrack = section.getCode(); this.actualArriveTime = arriveTime; this.parking = true; - if (Objects.nonNull(this.planArriveTime)) { + if (!this.isPlanTrain()) { + this.dt = 0; + } else if (Objects.nonNull(this.planArriveTime)) { this.dt = this.planArriveTime.toSecondOfDay() - arriveTime.toSecondOfDay(); - } else if (this.isPlanTrain()) { + } else { log.warn(String.format("列车[%s-%s|%s|%s]到达车站，没有计划到达，无法更新到达与计划误差时间", groupNumber, serviceNumber, tripNumber, destinationCode)); } From d76d9868afe1352a74c1b1a573cfcbf1df776507 Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 30 Aug 2021 13:08:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BF=A1=E5=8F=B7=E5=B0=81=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../joylink/rtss/simulation/cbtc/CI/service/SignalService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SignalService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SignalService.java index 95a3451f7..1c1326664 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SignalService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SignalService.java @@ -34,6 +34,7 @@ public class SignalService { public void blockade(Simulation simulation, Signal signal) { if(!signal.isBlockade()) { signal.setBlockade(true); + this.close(simulation, signal); if (signal.getLockedRoute() != null) { signal.setReblockade(true); log.debug(signal.debugStr() + "因信号机封锁且有锁闭的进路而重复封锁");