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

修改：设置联锁自动触发不再关闭进路自动控（ats进路自动触发逻辑对应修改）

Browse Source
This commit is contained in:
joylink_zhangsai 2021-07-16 11:16:43 +08:00
parent 86dce84b28
commit 341a8a92bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteService.java
View File

@ -170,7 +170,7 @@ public class AtsRouteService {
} }
}); });
for (Route route : routeList) { for (Route route : routeList) {
route.setAtsControl(false); // route.setAtsControl(false);
if (route.isArs()) if (route.isArs())
route.setCiControl(true); route.setCiControl(true);
} }

2
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsRouteSettingService.java
View File

@ -526,7 +526,7 @@ public class AtsRouteSettingService {
private boolean isAtsTrigger(Simulation simulation, TrainInfo train, Route route, private boolean isAtsTrigger(Simulation simulation, TrainInfo train, Route route,
boolean turnBack, List<TrainInfo> trainList) { boolean turnBack, List<TrainInfo> trainList) {
if (route.isAtsControl() && !route.isOpen()) { if (route.isAtsControl() && !route.isCiControl() && !route.isOpen()) {
if (route.hasSwitchFault()) { // 进路内存在故障道岔，不触发办理 if (route.hasSwitchFault()) { // 进路内存在故障道岔，不触发办理
return false; return false;
} }