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

修改站间运行时间计算预计离开时间有时空指针的bug

Browse Source
This commit is contained in:
walker-sheng 2021-02-05 09:50:13 +08:00
parent 3f35c48cb3
commit a87ca75d37
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsPlanService.java
View File

@ -383,13 +383,16 @@ public class AtsPlanService {
if (Objects.equals(train.getPlanStandTrack(), nextStationPlan.getSection().getCode())) {
return;
} else {
train.updatePlanInfo(nextStationPlan);
long runningTime = ChronoUnit.SECONDS.between(estimatedLeaveTime,
long runningTime = ChronoUnit.SECONDS.between(stationPlan.getLeaveTime(), nextStationPlan.getArriveTime());
if (estimatedLeaveTime != null) {
runningTime = ChronoUnit.SECONDS.between(estimatedLeaveTime,
nextStationPlan.getArriveTime());
}
long planTime = ChronoUnit.SECONDS.between(stationPlan.getLeaveTime(), nextStationPlan.getArriveTime());
if (runningTime > planTime * 2) {
runningTime = planTime * 2;
}
train.updatePlanInfo(nextStationPlan);
this.onboardAtpApiService.updateNextStation(simulation,
train.getGroupNumber(),
nextStationPlan.getStation().getCode(),