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:
DU 2020-12-03 11:01:50 +08:00
parent 2eb8da551d
commit b2f6c6a71d
5 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/20201203.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `training`
ADD INDEX `map_id` (`map_id`);

5
src/main/java/club/joylink/rtss/services/training/generatornew/base/SectionGeneratorNew.java
View File

@ -76,10 +76,13 @@ public class SectionGeneratorNew implements GeneratorNew {
case Section_Fault_Unlock:
// 设置区段故障锁闭（这只是区故解的一种情况，后面再补其他情况）
section.setFaultLock(true);
if (section.isShowLogic()) {
section.getLogicList().forEach(s -> s.setFaultLock(true));
}
break;
case Section_Axis_Pre_Reset:
// todo 因为操作暂未实现，此实训暂不生成
break;
continue;
default:
// 其他操作，不生成
continue;

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

@ -281,26 +281,27 @@ public class SignalGeneratorNew implements GeneratorNew {
}
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;
// }
continue;
}
case Signal_Close_Guide: {
// 若信号可开放引导信号，生成实训，背景设置为开放引导进路/开放引导信号

1
src/main/java/club/joylink/rtss/services/training/generatornew/base/SwitchGeneratorNew.java
View File

@ -92,6 +92,7 @@ public class SwitchGeneratorNew implements GeneratorNew {
// 背景为道岔区段故障锁闭
aSwitch.getA().setFaultLock(true);
aSwitch.getB().setFaultLock(true);
aSwitch.getC().setFaultLock(true);
break;
}
case Switch_Axle_Pre_Reset:{

3
src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SectionService.java
View File

@ -76,6 +76,9 @@ public class SectionService {
}
}
section.faultUnlock();
if(section.isShowLogic()){
section.getLogicList().forEach(ls -> ls.faultUnlock());
}
}
}