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

恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查

Browse Source
This commit is contained in:
joylink_zhangsai 2021-01-18 17:24:06 +08:00
parent ad529992af
commit 3b99e3f5ea
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java
View File

@ -869,15 +869,17 @@ public class RouteService {
return level;
}
}
// // 如果进路区段中有站台轨，站台屏蔽门开着，需要关灯
// List<Section> standTracks = sectionList.stream().filter(Section::isStandTrack).collect(Collectors.toList());
// if (!CollectionUtils.isEmpty(standTracks)) {
// for (Section standTrack : standTracks) {
// List<Stand> standList = standTrack.getStandList();
// if (standList.stream().anyMatch(stand -> stand.getPsd() != null && !stand.getPsd().isCloseAndLock()))
// return false;
// }
// }
// 非CBTC下，如果进路区段中有站台轨，站台屏蔽门开着，需要关灯
if (!route.isCbtcMode()) {
List<Section> standTracks = sectionList.stream().filter(Section::isStandTrack).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(standTracks)) {
for (Section standTrack : standTracks) {
List<Stand> standList = standTrack.getStandList();
if (standList.stream().anyMatch(stand -> stand.getPsd() != null && !stand.getPsd().isCloseAndLock()))
return level;
}
}
}
} else { // 后备模式检查
// 区段占用检查
Route.CheckFailMessage checkFailMessage = this.ciLevelCheck(route);