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

列车到站后先记录实际运行图信息；实迹运行图添加是否站前折返字段

Browse Source
This commit is contained in:
joylink_zhangsai 2021-05-10 14:34:10 +08:00
parent f3115f7faf
commit a4b42d13d8
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,8 +55,14 @@ public class AtsPlanService {
*/
public void recordTrainRealRun(Simulation simulation, TrainInfo train,
Station arriveStation, Section parkingSection, boolean arrive) {
TripPlan tripPlan = simulation.getRepository().getTripPlan(train.getServiceNumber(), train.getTripNumber());
SimulationDataRepository repository = simulation.getRepository();
TripPlan tripPlan = repository.getTripPlan(train.getServiceNumber(), train.getTripNumber());
LocalDateTime systemTime = simulation.getSystemTime();
Boolean frontTurnBack = null;
RealRun lastRealRun = repository.queryLastRealRun(train.getGroupNumber());
if (lastRealRun != null && lastRealRun.getRight() != null && !Objects.equals(lastRealRun.getRight(), tripPlan.isRight())) {
frontTurnBack = !arrive;
}
RealRun realRun = RealRun.builder().
groupNumber(train.getGroupNumber()).
serviceNumber(train.getServiceNumber()).
@ -67,8 +73,9 @@ public class AtsPlanService {
right(tripPlan.isRight()).
time(systemTime).
second(systemTime.toLocalTime().toSecondOfDay()).
frontTurnBack(frontTurnBack).
build();
simulation.getRepository().addRealRunRecord(realRun);
repository.addRealRunRecord(realRun);
this.atsMessageCollectAndDispatcher.sendTrainRunData(simulation, realRun);
}
@ -649,6 +656,9 @@ public class AtsPlanService {
train.getTripNumber(), train.getDestinationCode(),
station.getName(), station.getCode(),
section.getName(), section.getCode()));
if (train.isPlanTrain()) { //先记录实迹运行图，以免ATS主逻辑改掉服务-车次号
this.recordTrainRealRun(simulation, train, station, section, true);
}
// 列车到站状态
LocalTime systemTime = simulation.getSystemTime().toLocalTime();
int parkTime = this.atsStandService.trainParkingAndGetParkTime(simulation, section);
@ -656,8 +666,6 @@ public class AtsPlanService {
if (train.isPlanTrain()) {
SimulationDataRepository repository = simulation.getRepository();
TripPlan tripPlan = repository.getTripPlan(train.getServiceNumber(), train.getTripNumber());
// 记录列车实际运行到站信息
this.recordTrainRealRun(simulation, train, station, section, true);
// 更新追踪列车到站状态
StationPlan stationPlan = tripPlan.queryStationPlanByStation(station);
if (parkTime < 0) {

9
src/main/java/club/joylink/rtss/simulation/cbtc/data/SimulationDataRepository.java
View File

@ -1068,4 +1068,13 @@ public class SimulationDataRepository {
}
return list;
}
public RealRun queryLastRealRun(String groupNumber) {
for (int i = this.realRunRecordList.size() - 1; i >= 0; i--) {
RealRun realRun = this.realRunRecordList.get(i);
if (realRun.getGroupNumber().equals(groupNumber))
return realRun;
}
return null;
}
}

2
src/main/java/club/joylink/rtss/simulation/cbtc/data/plan/RealRun.java
View File

@ -43,6 +43,8 @@ public class RealRun {
@JsonSerialize(using = Boolean2NumSerializer.class)
private Boolean right;
private Boolean frontTurnBack;
public String getSTNumber() {
return String.format("%s%s", this.serviceNumber, this.tripNumber == null ? "" : this.tripNumber);
}