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 dev

Browse Source
This commit is contained in:
joylink_zhangsai 2021-08-11 14:56:35 +08:00
commit c4cc217cd3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,18 +98,23 @@ public class RouteOverlap extends MapNamedElement {
public void releaseImmediately() { public void releaseImmediately() {
if (!CollectionUtils.isEmpty(this.pathList)) { if (!CollectionUtils.isEmpty(this.pathList)) {
for (SectionPath path : this.pathList) { for (SectionPath path : this.pathList) {
List<RouteFls> flsList = path.getFlsList();
for (SwitchElement element : path.getSwitchList()) { for (SwitchElement element : path.getSwitchList()) {
element.getASwitch().overlapUnLock(); Switch aSwitch = element.getASwitch();
aSwitch.overlapUnLock();
if (!CollectionUtils.isEmpty(flsList)) {
for (RouteFls routeFls : flsList) {
if (routeFls.getBase().getASwitch().equals(aSwitch) &&
!aSwitch.isRouteLock()) {
routeFls.unlock();
}
}
}
} }
for (Section section1 : path.getSectionList()) { for (Section section1 : path.getSectionList()) {
section1.overlapUnlocking(); section1.overlapUnlocking();
} }
List<RouteFls> flsList = path.getFlsList();
if (!CollectionUtils.isEmpty(flsList)) {
for (RouteFls routeFls : flsList) {
routeFls.unlock();
}
}
} }
} }
this.forbidden = true; this.forbidden = true;