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:
joylink_zhangsai 2021-03-23 11:18:44 +08:00
parent ced64ef381
commit d930f18d52
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsStationService.java
View File

@ -434,7 +434,11 @@ public class AtsStationService {
* 计轴预复位 * 计轴预复位
*/ */
public void preReset(Simulation simulation, Station station) { public void preReset(Simulation simulation, Station station) {
station.getPreResetValidDuration().set(60 * 1000); if (station.isCentralized()) {
station.getPreResetValidDuration().set(60 * 1000);
} else {
station.getDeviceStation().getPreResetValidDuration().set(60 * 1000);
}
} }
/** /**

6
src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl.java
View File

@ -631,9 +631,9 @@ public class CiApiServiceImpl implements CiApiService {
VirtualRealitySectionAxleCounter virtualAxleCounter = axleSection.getVirtualAxleCounter(); VirtualRealitySectionAxleCounter virtualAxleCounter = axleSection.getVirtualAxleCounter();
BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(virtualAxleCounter.isOccupy(), section.debugStr() + "计轴未占用，无需预复位"); BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(virtualAxleCounter.isOccupy(), section.debugStr() + "计轴未占用，无需预复位");
if (simulation.getRepository().getConfig().isStationPreResetBeforeAxlePreReset()) { if (simulation.getRepository().getConfig().isStationPreResetBeforeAxlePreReset()) {
Station station = axleSection.getStation(); Station deviceStation = axleSection.getDeviceStation();
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(station, section.debugStr() + "没有所属车站"); BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotNull(deviceStation, section.debugStr() + "没有所属集中站");
BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(station.isPreReset(), station.debugStr() + "需处于预复位状态"); BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertTrue(deviceStation.isPreReset(), deviceStation.debugStr() + "需处于预复位状态");
} }
return virtualAxleCounter; return virtualAxleCounter;
} }

10
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/DestinationCodeDefinition.java
View File

@ -53,6 +53,11 @@ public class DestinationCodeDefinition {
*/ */
private Boolean rightFrontTurnBack; private Boolean rightFrontTurnBack;
/**
* 必选进路
*/
private Route necessaryRoute;
//根据目的地码的定义数据，生成路径 //根据目的地码的定义数据，生成路径
/** /**
* 目的地码代表的运行路径（物理区段） * 目的地码代表的运行路径（物理区段）
@ -62,12 +67,12 @@ public class DestinationCodeDefinition {
private List<Route> routes; private List<Route> routes;
public DestinationCodeDefinition(String code, Type type, Section section) { public DestinationCodeDefinition(String code, Type type, Section section) {
this(code, type, null, null, section, null, null, null, null, null, null, null, null); this(code, type, null, null, section, null, null, null, null, null, null, null, null, null);
} }
public DestinationCodeDefinition(String code, Type type, String description, Section startSection, Section section, Boolean right, public DestinationCodeDefinition(String code, Type type, String description, Section startSection, Section section, Boolean right,
List<Section> necessarySections, Station leftStation, Boolean leftFrontTurnBack, List<Section> necessarySections, Station leftStation, Boolean leftFrontTurnBack,
Station rightStation, Boolean rightFrontTurnBack, List<Section> runPath, List<Route> routes) { Station rightStation, Boolean rightFrontTurnBack, Route route, List<Section> runPath, List<Route> routes) {
this.code = code; this.code = code;
this.type = type; this.type = type;
this.description = description; this.description = description;
@ -79,6 +84,7 @@ public class DestinationCodeDefinition {
this.leftFrontTurnBack = leftFrontTurnBack; this.leftFrontTurnBack = leftFrontTurnBack;
this.rightStation = rightStation; this.rightStation = rightStation;
this.rightFrontTurnBack = rightFrontTurnBack; this.rightFrontTurnBack = rightFrontTurnBack;
this.necessaryRoute = route;
this.runPath = runPath; this.runPath = runPath;
this.routes = routes; this.routes = routes;
} }