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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
joylink_zhangsai 2021-01-21 16:16:45 +08:00
commit f67542a5c2
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,9 +39,7 @@ public class AtsRouteSettingService {
// 执行进路排列
for (TrainRoute trainRoute : waitSetList) {
Route route = trainRoute.getRoute();
if (!simulation.getRepository().hasSettingRoute(route)) {
this.ciApiService.settingRoute(simulation, route.getCode());
}
this.ciApiService.settingRoute(simulation, route.getCode());
}
}

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

@ -798,9 +798,13 @@ public class RouteService {
List<Section> sectionList = route.getSectionList();
for (Section section : sectionList) {
if (!section.isRouteLockOn(right)) {
log.info(String.format("进路[%s]连锁条件检查失败：区段[%s]锁闭方向错误", route.debugStr(),
section.debugStr()));
return level;
}
if (section.isNoStatus()) {
log.info(String.format("进路[%s]连锁条件检查失败：区段[%s]连锁无状态", route.debugStr(),
section.debugStr()));
return level;
}
}
@ -819,13 +823,15 @@ public class RouteService {
} else {
p = "失表";
}
log.debug(String.format("联锁网络检查失败：道岔[%s(%s)]位置[%s]",
log.info(String.format("进路[%s]连锁条件检查失败：道岔[%s(%s)]位置[%s]",
route.debugStr(),
element.getASwitch().getName(), element.getASwitch().getCode(), p));
return level;
}
}
level = Signal.LEVEL_2; // 引导级
if (route.getStart().isBlockade()) {
log.info(String.format("进路[%s]连锁条件检查失败：始端信号机封锁", route.debugStr()));
return level;
}
// 进路侧防检查
@ -845,6 +851,7 @@ public class RouteService {
if ((pSignal != null && !pSignal.isClose()) ||
(fpae != null && !fpae.getASwitch().isOnPosition(fpae.isNormal()))) {
level1Result = false;
break;
}
}
}
@ -857,6 +864,8 @@ public class RouteService {
if (!CollectionUtils.isEmpty(route.getEspList())) {
for (ESP esp : route.getEspList()) {
if (esp.isEffective()) {
log.info(String.format("进路[%s]连锁条件检查失败：站台紧急停车按钮[%s]按下", route.debugStr(),
esp.debugStr()));
return level;
}
}
@ -871,10 +880,12 @@ public class RouteService {
Collections.reverse(logicList);
}
if (logicList.get(0).isOccupied()) {
log.info(String.format("进路[%s]连锁条件检查失败：CTC模式首个区段占用", route.debugStr()));
return level;
}
} else {
if (firstRouteSection.isOccupied()) {
log.info(String.format("进路[%s]连锁条件检查失败：CTC模式首个区段占用", route.debugStr()));
return level;
}
}
@ -882,7 +893,8 @@ public class RouteService {
// 区段占用检查
Route.CheckFailMessage checkFailMessage = this.ciLevelCheck(route);
if (Objects.nonNull(checkFailMessage)) {
log.debug(String.format("联锁网络检查失败：[%s]", checkFailMessage.toJson()));
log.info(String.format("进路[%s]连锁条件检查失败：[%s]",
route.debugStr(), checkFailMessage.toJson()));
return level;
}
// // 屏蔽门
@ -900,7 +912,8 @@ public class RouteService {
if (!CollectionUtils.isEmpty(route.getStandHoldList())) {
for (Stand stand : route.getStandHoldList()) {
if (stand.isHoldTrain()) {
log.debug(String.format("联锁网络检查失败：站台[%s(%s)]扣车",
log.info(String.format("进路[%s]连锁条件检查失败：站台[%s(%s)]扣车",
route.debugStr(),
stand.getName(), stand.getCode()));
return level;
}
@ -1159,8 +1172,8 @@ public class RouteService {
if (!interlocked) {
// 进路信号开放，联锁逻辑不满足，需关闭信号
this.routeClose(simulation, route);
log.debug(String.format("进路始端信号联锁条件不满足，信号机[%s(%s)]关灯",
route.getStart().getName(), route.getStart().getCode()));
log.info(String.format("进路[%s]始端信号联锁条件不满足，信号机[%s(%s)]关灯",
route.debugStr(), route.getStart().getName(), route.getStart().getCode()));
}
// this.reLockOverlap(simulation, route);
// }