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

大铁CTC去掉ATS进路触发功能；修改CTC股道视图计划生成逻辑

Browse Source
This commit is contained in:
joylink_zhangsai 2022-04-24 16:54:11 +08:00
parent 67ac1683c4
commit af36dd547d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainMonitorService.java
View File

@ -83,7 +83,9 @@ public class AtsTrainMonitorService {
} }
} }
// ATS自动进路触发 // ATS自动进路触发
this.atsTriggerRouteService.tryTrigger(simulation, trainInfo); if (!simulation.getRepository().getConfig().isHasCTC()) {
this.atsTriggerRouteService.tryTrigger(simulation, trainInfo);
}
// // PIS语音自动触发 // // PIS语音自动触发
// if (trainInfo.isBeAbout2Arrival()) { // if (trainInfo.isBeAbout2Arrival()) {
// String estimatedArriveStandTrack = trainInfo.getEstimatedArriveStandTrack(); // String estimatedArriveStandTrack = trainInfo.getEstimatedArriveStandTrack();

4
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/CTCLogicLoop.java
View File

@ -184,8 +184,9 @@ public class CTCLogicLoop {
VirtualRealityTrain train = repository.getOnlineTrainBy(trainInfo.getGroupNumber()); VirtualRealityTrain train = repository.getOnlineTrainBy(trainInfo.getGroupNumber());
StationPlan stationPlan = tripPlan.queryStationPlanByStationCode(trainInfo.getStationCode()); StationPlan stationPlan = tripPlan.queryStationPlanByStationCode(trainInfo.getStationCode());
Section headSection = train.getHeadPosition().getSection(); Section headSection = train.getHeadPosition().getSection();
Section previousSection = headSection;
while (stationPlan != null) { while (stationPlan != null) {
List<RoutePath> paths = repository.queryRoutePathsByEndAndContainsSection(stationPlan.getSection(), headSection); List<RoutePath> paths = repository.queryRoutePathsByEndAndContainsSection(stationPlan.getSection(), previousSection);
if (!CollectionUtils.isEmpty(paths)) { if (!CollectionUtils.isEmpty(paths)) {
paths = paths.stream().filter(routePath -> Objects.equals(routePath.isRight(), tripPlan.isRight())).collect(Collectors.toList()); paths = paths.stream().filter(routePath -> Objects.equals(routePath.isRight(), tripPlan.isRight())).collect(Collectors.toList());
} }
@ -216,6 +217,7 @@ public class CTCLogicLoop {
RoutePath routePath = selectRoutePath(routePaths); RoutePath routePath = selectRoutePath(routePaths);
Route departureRoute = routePath.getFirstRoute(); Route departureRoute = routePath.getFirstRoute();
ctcStationPlan.setDepartureRoute(departureRoute); ctcStationPlan.setDepartureRoute(departureRoute);
previousSection = stationPlan.getSection();
} }
stationPlan = tripPlan.queryNextStationPlan(stationPlan.getStation()); stationPlan = tripPlan.queryNextStationPlan(stationPlan.getStation());
} }