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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1

Browse Source
This commit is contained in:
DU 2021-01-28 17:57:48 +08:00
commit 32972e5697
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
View File

@ -172,7 +172,7 @@ public class ZCLogicLoop {
break;
}
//非通信车占用区段
if (temp.isNonCbtcOccupy()) {
if (temp.isNonCbtcOccupy() && !temp.isSwitchTrack()) {
deviceEnd = new MovementAuthority.End(section,
MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION);
break;

10
src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
View File

@ -737,15 +737,15 @@ public class CalculateService {
Set<Section> sections = routeMap.keySet();
for (Section last : sections) {
List<Route> tempList = routeMap.get(last);
if (tempList.contains(lastRouteSection)) {
if (Objects.equals(last, lastRouteSection)) {
break;
}
if (tempList.get(0).getSectionList().contains(lastRouteSection)) {
handled = true;
tempList.add(route);
List<Route> nextRouteList = route.getDestination().getRouteList();
if (nextRouteList.size() == 1 &&
Objects.equals(nextRouteList.get(0).getLastRouteSection(), last)) {
if (nextRouteList.size() == 1) {
tempList.addAll(nextRouteList);
} else {
throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception();
}
}
}