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

修改联锁生成逻辑：解决同时设置“多延续保护生成多条进路”与“触发式延续保护”时，本该有且仅有一个延续保护的进路实际会没有延续保护的问题

This commit is contained in:
joylink_zhangsai 2023-10-31 10:37:58 +08:00
parent 361d446a19
commit 376590f5d1
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,14 +413,6 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
// 生成交路数据
List<MapRoutingDataVO> generateRoutingList = this.routingGenerator.generateAllRouting(deviceMap, errorList);
//站间运行等级生成
// List<MapStationRunLevelVO> generatedStationRunLevelList =
// this.runLevelGenerator.generateRunLevels(
// generateRoutingList, deviceMap, errorList
// );
// 停站时间生成
// List<MapStationParkingTimeVO> parkTimeList = this.parkTimeGenerator.generate(deviceMap, errorList);
//目的地码生成
List<DestinationCodeDefinition> destinationCodeDefinitionList
= generateDestinationCodeDefinition(config, sectionList, stationList);
@ -693,7 +685,7 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
clickEnd = this.queryNearlySignalOf(start, sectionPath);
}
// 构建进路
if (config.isRouteApartByOverlap() && overlapList != null && overlapList.size() > 1) {
if (config.isRouteApartByOverlap() && !CollectionUtils.isEmpty(overlapList)) {
int index = 1;
for (RouteOverlap routeOverlap : overlapList) {
String code = routeCodeGenerator.next();
@ -713,7 +705,7 @@ public class DraftMapCiDataGeneratorImpl implements DraftMapCiDataGenerator {
String code = routeCodeGenerator.next();
String name = String.format("%s-%s", start.getName(), endName);
RouteOverlap overlap = null;
if (!CollectionUtils.isEmpty(overlapList) && overlapList.size() > 0) {
if (!CollectionUtils.isEmpty(overlapList)) {
overlap = overlapList.get(0);
}
Route route = this.buildRoute(code, name, start, end, clickEnd, sectionPath, overlap,

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

@ -272,7 +272,6 @@ public class CiRouteService {
// 检查信号开放条件,开信号
this.ciService.interlockCheck(simulation, route);
SignalAspect aspect = null;
boolean routeRight = route.isRight();
if (route.isGuideSetting()) {
aspect = route.getSettedAspect();
} else if (route.getStart().isBlockade()) {