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 third-part-control

Browse Source
This commit is contained in:
walker-sheng 2021-06-09 18:30:19 +08:00
commit 09de047a74
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/club/joylink/rtss/simulation/cbtc/CI/CILogicLoop.java
View File

@ -177,6 +177,7 @@ public class CILogicLoop {
for (RouteOverlap overlap : overlapList) { for (RouteOverlap overlap : overlapList) {
if (overlap.isLock()) {// 延续保护已锁闭 if (overlap.isLock()) {// 延续保护已锁闭
this.routeService.overlapUnlock(simulation, overlap); this.routeService.overlapUnlock(simulation, overlap);
this.routeService.overlapCancelLock(overlap);
} else { } else {
// 延续保护锁闭禁止条件释放 // 延续保护锁闭禁止条件释放
this.routeService.checkAndAllowOverlap(simulation, overlap); this.routeService.checkAndAllowOverlap(simulation, overlap);

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

@ -1313,15 +1313,18 @@ public class RouteService {
this.checkAndSetLockedRouteOverlap(simulation, route); this.checkAndSetLockedRouteOverlap(simulation, route);
} }
} }
//延续保护锁闭后持续监视 }
if (overlap != null && overlap.isLock()) {
SectionPath sectionPath = overlap.selectPath(); /**
List<SwitchElement> switchList = sectionPath.getSwitchList(); * 延续保护取消锁闭
List<RouteFls> flsList = sectionPath.getFlsList(); */
boolean onPosition = this.checkRouteSwitchPosition(switchList) && this.isFlsCheckPass(flsList); public void overlapCancelLock(RouteOverlap overlap) {
if (!onPosition) { SectionPath sectionPath = overlap.selectPath();
overlap.setLock(false); List<SwitchElement> switchList = sectionPath.getSwitchList();
} List<RouteFls> flsList = sectionPath.getFlsList();
boolean onPosition = this.checkRouteSwitchPosition(switchList) && this.isFlsCheckPass(flsList);
if (!onPosition) {
overlap.setLock(false);
} }
} }
@ -1454,11 +1457,13 @@ public class RouteService {
public void handleTrainStopMessage(Simulation simulation, TrainStopMessage stopMessage) { public void handleTrainStopMessage(Simulation simulation, TrainStopMessage stopMessage) {
// 进路最后一个区段通信车停车，进路延续保护立即解锁 // 进路最后一个区段通信车停车，进路延续保护立即解锁
Section section = stopMessage.getSection();
if (!section.isRouteLock())
return;
List<RouteOverlap> overlapList = simulation.getRepository() List<RouteOverlap> overlapList = simulation.getRepository()
.getListByType(MapElement.DeviceType.OVERLAP, RouteOverlap.class); .getListByType(MapElement.DeviceType.OVERLAP, RouteOverlap.class);
for (RouteOverlap routeOverlap : overlapList) { for (RouteOverlap routeOverlap : overlapList) {
Section section = stopMessage.getSection(); if (routeOverlap.allSectionsOl() && section.isRouteLockOn(routeOverlap.isRight()) && routeOverlap.isRouteLastSection(section)) {
if (/*routeOverlap.isLock() && */ routeOverlap.anyElementLocked() && routeOverlap.isRouteLastSection(section)) {
// 是此延续保护的解锁区段，立即解锁 // 是此延续保护的解锁区段，立即解锁
routeOverlap.releaseImmediately(); routeOverlap.releaseImmediately();
log.debug(String.format("收到列车停稳消息，[%s]延续保护[%s],触发区段[%s(%s)]立即解锁", log.debug(String.format("收到列车停稳消息，[%s]延续保护[%s],触发区段[%s(%s)]立即解锁",

18
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/RouteOverlap.java
View File

@ -237,24 +237,16 @@ public class RouteOverlap extends MapNamedElement {
/** /**
* 有延续保护的元素处于锁闭状态 * 有延续保护的元素处于锁闭状态
*/ */
public boolean anyElementLocked() { public boolean allSectionsOl() {
if (!CollectionUtils.isEmpty(this.pathList)) { if (!CollectionUtils.isEmpty(this.pathList)) {
for (SectionPath path : this.pathList) { for (SectionPath path : this.pathList) {
if (path.getSwitchList().stream().anyMatch(element -> element.getASwitch().isOverlapLock())) { for (Section s : path.getSectionList()) {
return true; if (!s.isOverlapLock()) {
} return false;
if (path.getSectionList().stream().anyMatch(Section::isOverlapLock)) {
return true;
}
List<RouteFls> flsList = path.getFlsList();
if (!CollectionUtils.isEmpty(flsList)) {
for (RouteFls routeFls : flsList) {
if (routeFls.anyLocked())
return true;
} }
} }
} }
} }
return false; return true;
} }
} }