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

车辆段联锁生成-终端按钮

Browse Source
This commit is contained in:
Jade 2021-09-28 14:53:51 +08:00
parent 7f6d9c863d
commit 548564d146
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java
View File

@ -755,7 +755,8 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
|| (Signal.SignalType.OUTBOUND.equals(endSignalType) && Signal.SignalType.SHUNTING2.equals(startSignalType))) { || (Signal.SignalType.OUTBOUND.equals(endSignalType) && Signal.SignalType.SHUNTING2.equals(startSignalType))) {
// 列车进路 // 列车进路
signalAspect = SignalAspect.Y; signalAspect = SignalAspect.Y;
if (Objects.nonNull(endOpSignal) && endOpSignalType.equals(startSignalType)) { if (Objects.nonNull(endOpSignal) && (Signal.SignalType.SHUNTING2.equals(endOpSignalType)
|| Signal.SignalType.OUTBOUND.equals(endOpSignalType))) {
clickEnd = endOpSignal; clickEnd = endOpSignal;
} else { } else {
clickEnd = endSignal; clickEnd = endSignal;
@ -766,9 +767,8 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
if (Objects.nonNull(nextOpSignal)) { if (Objects.nonNull(nextOpSignal)) {
// 下个区段反向信号机存在，则使用 // 下个区段反向信号机存在，则使用
clickEnd = nextOpSignal; clickEnd = nextOpSignal;
} else if ((Objects.isNull(nextSection) || Signal.SignalType.BLOCKING.equals(endSignalType)) } else if (Objects.nonNull(endOpSignal) && sectionPath.getSectionList().size() > 1) {
&& Objects.nonNull(endOpSignal) && sectionPath.getSectionList().size() > 1) { // 使用反向信号机，过滤列车兼调车信号机至尽头
// 尽头/阻挡信号机，使用反向信号机，过滤列车兼调车信号机至尽头
clickEnd = endOpSignal; clickEnd = endOpSignal;
} else { } else {
// 其余设置为终端信号机，可能为null // 其余设置为终端信号机，可能为null
@ -1961,17 +1961,11 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
return; return;
} }
// 调车信号机 -> 列车兼调车信号机， 存在只有一个区段的情况 // 调车信号机 -> 列车兼调车信号机， 存在只有一个区段的情况
if (signal.getType().equals(Signal.SignalType.SHUNTING2)) {
routePathList.add(tempPath);
return;
}
// 调车信号机 -> 阻挡信号机 // 调车信号机 -> 阻挡信号机
if (signal.getType().equals(Signal.SignalType.BLOCKING)) {
routePathList.add(tempPath);
return;
}
// 调车信号机 -> 出段信号机 // 调车信号机 -> 出段信号机
if (signal.getType().equals(Signal.SignalType.OUTBOUND)) { if (Signal.SignalType.SHUNTING2.equals(signal.getType())
|| Signal.SignalType.BLOCKING.equals(signal.getType())
|| Signal.SignalType.OUTBOUND.equals(signal.getType())) {
routePathList.add(tempPath); routePathList.add(tempPath);
return; return;
} }