joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
walker-sheng 2021-08-30 17:09:11 +08:00
commit 72c6ded4ec
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SignalService.java
View File

@ -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() + "因信号机封锁且有锁闭的进路而重复封锁");

6
src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java
View File

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