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

修改佛山线运行图导入逻辑；修改ats准备发车时的逻辑

Browse Source
This commit is contained in:
joylink_zhangsai 2022-03-31 10:22:20 +08:00
parent 5c3a88d2aa
commit 78796a7009
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/club/joylink/rtss/services/runplan/importReal/FoshanTramRunPlanNew.java
View File

@ -80,7 +80,7 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
tripVO.setDestinationCode("BF"); tripVO.setDestinationCode("BF");
break; break;
case "雷岗": case "雷岗":
if (tripVO.getServiceNumber().equals("09")) { //据观察，服务号09是调试车 if (tripVO.getServiceNumber().equals("02")) { //据观察，服务号02是备用车
tripVO.setStartSectionCode("T38"); //G2109 tripVO.setStartSectionCode("T38"); //G2109
tripVO.setDestinationCode("AA"); tripVO.setDestinationCode("AA");
} else { } else {
@ -108,7 +108,7 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
tripVO.setDestinationCode("BF"); tripVO.setDestinationCode("BF");
break; break;
case "雷岗": case "雷岗":
if (tripVO.getServiceNumber().equals("09")) { //据观察，服务号09是调试车 if (tripVO.getServiceNumber().equals("02")) { //据观察，服务号02是备用车
tripVO.setEndSectionCode("T38"); //G2109 tripVO.setEndSectionCode("T38"); //G2109
tripVO.setDestinationCode("AA"); tripVO.setDestinationCode("AA");
} else { } else {
@ -117,6 +117,9 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
} }
break; break;
} }
if (tripVO.getServiceNumber().equals("02")) {
tripVO.setIsBackUp(true);
}
} }
/** /**
@ -133,7 +136,7 @@ public class FoshanTramRunPlanNew implements IRunPlanStrategyNew {
return; return;
} }
if ("雷岗".equals(stationVO.getRunPlanName())) { if ("雷岗".equals(stationVO.getRunPlanName())) {
if (runPlanImport.getServiceNumber().equals("09")) { //据观察，服务号09是调试车 if (runPlanImport.getServiceNumber().equals("02")) { //据观察，服务号02是备用车
timeVO.setSectionCode("T38"); //G2109 timeVO.setSectionCode("T38"); //G2109
} else { } else {
timeVO.setSectionCode("T39"); //G2103 timeVO.setSectionCode("T39"); //G2103

3
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/stage/AtsPlanTrainStageService.java
View File

@ -163,6 +163,9 @@ public class AtsPlanTrainStageService implements AtsStageService {
return; return;
} }
if (tripPlan.isLastPlan(stationPlan)) { if (tripPlan.isLastPlan(stationPlan)) {
if (tripPlan.isBackup() && parkSection.equals(tripPlan.getEndSection())) {
return;
}
// 到达终点站，准备折返 // 到达终点站，准备折返
log.debug(String.format("列车[%s]折返初始化", trainInfo.getGroupNumber())); log.debug(String.format("列车[%s]折返初始化", trainInfo.getGroupNumber()));
List<RoutePath> routePaths = repository.getRoutePaths(parkSection, tripPlan.getEndSection()); List<RoutePath> routePaths = repository.getRoutePaths(parkSection, tripPlan.getEndSection());