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 2020-12-03 19:18:13 +08:00
parent 2eb8da551d
commit ea86955e6f
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/club/joylink/rtss/services/training/generatornew/base/SignalGeneratorNew.java
View File

@ -280,27 +280,27 @@ public class SignalGeneratorNew implements GeneratorNew {
continue;
}
case Signal_Set_Guide: {
// 若信号机可开引导信号，则生成实训，暂不设置背景（暂时先简单处理，此处业务比较复杂，需明确后再生成各种情况的实训）
if (!signal.isCallOn()) { // 不是引导信号机，不生成
continue;
} else {
//非折返进路办理引导
List<Route> notTurnBackRouteList = routeList.stream()
.filter(route -> !route.isTurnBack())
.collect(Collectors.toList());
if (routeLikeHa1) {
// 对于ATP进路、地面联锁进路、引导进路类的，取引导进路
notTurnBackRouteList = notTurnBackRouteList.stream()
.filter(route -> route.isGuide())
.collect(Collectors.toList());
}
for (Route route : notTurnBackRouteList) {
trainingVOList.add(this.build(config, simulation, route, operateDefinitionVO));
// 仿真重置
simulation.reset();
}
continue;
}
// // 若信号机可开引导信号，则生成实训，暂不设置背景（暂时先简单处理，此处业务比较复杂，需明确后再生成各种情况的实训）
// if (!signal.isCallOn()) { // 不是引导信号机，不生成
// continue;
// } else {
// //非折返进路办理引导
// List<Route> notTurnBackRouteList = routeList.stream()
// .filter(route -> !route.isTurnBack())
// .collect(Collectors.toList());
// if (routeLikeHa1) {
// // 对于ATP进路、地面联锁进路、引导进路类的，取引导进路
// notTurnBackRouteList = notTurnBackRouteList.stream()
// .filter(route -> route.isGuide())
// .collect(Collectors.toList());
// }
// for (Route route : notTurnBackRouteList) {
// trainingVOList.add(this.build(config, simulation, route, operateDefinitionVO));
// // 仿真重置
// simulation.reset();
// }
// continue;
// }
}
case Signal_Close_Guide: {
// 若信号可开放引导信号，生成实训，背景设置为开放引导进路/开放引导信号