引导进路办理实训不生成

This commit is contained in:
joylink_zhangsai 2020-12-03 19:18:13 +08:00
parent 2eb8da551d
commit ea86955e6f

View File

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