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

大铁线路2增加进路路径生成逻辑（因为没有站间运行等级和交路数据）

Browse Source
This commit is contained in:
joylink_zhangsai 2022-04-26 14:19:55 +08:00
parent af36dd547d
commit 75fc0d0915
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
View File

@ -251,7 +251,7 @@ public class InterlockBuilder2 {
// if (!errMsgList.isEmpty()) { // if (!errMsgList.isEmpty()) {
// return; // return;
// } // }
InterlockBuilder2.buildRoutePathFromStationRunLevel(stationRunLevelList, mapDataBuildResult, errMsgList); InterlockBuilder2.buildRoutePathFromStationRunLevel(map.getLineCode(), stationRunLevelList, mapDataBuildResult, errMsgList);
// buildParkTimes(logicData, elementMap, mapDataBuildResult.getParkTimeMap(), errMsgList); // buildParkTimes(logicData, elementMap, mapDataBuildResult.getParkTimeMap(), errMsgList);
} }
@ -1044,11 +1044,12 @@ public class InterlockBuilder2 {
return stationRunLevelList; return stationRunLevelList;
} }
private static void buildRoutePathFromStationRunLevel(List<StationRunLevel> stationRunLevelList, private static void buildRoutePathFromStationRunLevel(String lineCode, List<StationRunLevel> stationRunLevelList,
SimulationBuilder.SimulationDeviceBuildResult buildResult, SimulationBuilder.SimulationDeviceBuildResult buildResult,
List<String> errMsgList) { List<String> errMsgList) {
Map<String, List<RoutePath>> routePathMap = buildResult.getRoutePathMap(); Map<String, List<RoutePath>> routePathMap = buildResult.getRoutePathMap();
Map<String, MapElement> deviceMap = buildResult.getDeviceMap(); Map<String, MapElement> deviceMap = buildResult.getDeviceMap();
if (lineCode.equals("16")) {
List<Section> sections = deviceMap.values().stream() List<Section> sections = deviceMap.values().stream()
.filter(device -> device instanceof Section) .filter(device -> device instanceof Section)
.map(device -> (Section) device) .map(device -> (Section) device)
@ -1064,6 +1065,7 @@ public class InterlockBuilder2 {
} }
} }
} }
}
if (CollectionUtils.isEmpty(stationRunLevelList)) { if (CollectionUtils.isEmpty(stationRunLevelList)) {
return; return;
} }

28
src/main/java/club/joylink/rtss/simulation/cbtc/data/plan/StationPlan2.java Normal file
View File

@ -0,0 +1,28 @@
package club.joylink.rtss.simulation.cbtc.data.plan;
import club.joylink.rtss.simulation.cbtc.data.map.Route;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import club.joylink.rtss.simulation.cbtc.data.map.Station;
import java.time.LocalTime;
/**
* 车站接发车计划
*/
public class StationPlan2 {
private TripPlan tripPlan;
private Station station;
private Plan receivingPlan;
private Plan departurePlan;
class Plan {
private LocalTime time;
private Section section;
private Route route;
}
}