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

This commit is contained in:
joylink_zhangsai 2021-01-18 17:24:06 +08:00
parent ad529992af
commit 3b99e3f5ea

View File

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