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-09-27 14:45:18 +08:00
commit f240238e56
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1442,6 +1442,9 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
case BW: case BW:
route.setAspect(SignalAspect.W); route.setAspect(SignalAspect.W);
break; break;
default:
throw BusinessExceptionAssertEnum.DATA_ERROR.exception(String.format("信号机[%s]型号[%s]不正确",
start.debugStr(), start.getSignalModel()));
} }
route.setTurnBack(false); route.setTurnBack(false);
// 根据信号机和区段是否同向，设置进路联锁自排和是否车队模式 // 根据信号机和区段是否同向，设置进路联锁自排和是否车队模式

17
src/main/java/club/joylink/rtss/simulation/cbtc/build/MapDeviceBuilder.java
View File

@ -1121,13 +1121,24 @@ public class MapDeviceBuilder {
case PASSING: case PASSING:
case ARRIVAL: case ARRIVAL:
case EXIT: case EXIT:
signal.setSignalModel(SignalModel.RGY); if (signal.getSignalModel() == null ||
SignalModel.R.equals(signal.getSignalModel()) ||
SignalModel.BW.equals(signal.getSignalModel())) {
errMsgList.add(String.format("信号机[%s]类型[%s]和型号[%s]不匹配", signal.debugStr(),
signal.getType(), signal.getSignalModel()));
}
break; break;
case BLOCKING: case BLOCKING:
signal.setSignalModel(SignalModel.R); if (signal.getSignalModel() == null || !SignalModel.R.equals(signal.getSignalModel())) {
errMsgList.add(String.format("信号机[%s]类型[%s]和型号[%s]不匹配", signal.debugStr(),
signal.getType(), signal.getSignalModel()));
}
break; break;
case SHUNTING: case SHUNTING:
signal.setSignalModel(SignalModel.BW); if (signal.getSignalModel() == null || !SignalModel.BW.equals(signal.getSignalModel())) {
errMsgList.add(String.format("信号机[%s]类型[%s]和型号[%s]不匹配", signal.debugStr(),
signal.getType(), signal.getSignalModel()));
}
break; break;
} }
} }