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:
xiazengbin 2022-07-27 10:36:16 +08:00
parent 266463eb4c
commit a7a047390d
5 changed files with 883 additions and 860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiSignalControlService.java
View File

@ -91,7 +91,9 @@ public class CiSignalControlService {
public void blockade(Simulation simulation, Signal signal) {
if(!signal.isBlockade()) {
signal.setBlockade(true);
if(simulation.getRepository().getConfig().isSignalBolckOptReflectSignal()) {
this.tryControlSignalAspectAccordingLevel(simulation, signal, signal.getDefaultAspect());
}
if (signal.getLockedRoute() != null) {
signal.setReblockade(true);
log.debug(signal.debugStr() + "因信号机封锁且有锁闭的进路而重复封锁");

8
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
View File

@ -233,6 +233,13 @@ public class MapConfig {
* 大铁线路
*/
private boolean railway;
/**
* 对信号机封锁操作，是否影响信号显示
* <p>
* true-封锁信号机，会使信号机显示禁止色<br>
* false-封锁信号机，不会影响信号机显示。
*/
private boolean signalBolckOptReflectSignal;
/**
* 区故解只能应用于故障锁闭区段
@ -298,6 +305,7 @@ public class MapConfig {
setStandTbStrategyIsInvalid(configVO.isStandTbStrategyIsInvalid());
setUpdateTripPlanByServiceNumber(configVO.isUpdateTripPlanByServiceNumber());
setRailway(configVO.isRailway());
setSignalBolckOptReflectSignal(configVO.isSignalBolckOptReflectSignal());
setSFUCanOnlyApplyForFaultLockSection(configVO.isSFUCanOnlyApplyForFaultLockSection());
}
}

7
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java
View File

@ -177,9 +177,13 @@ public class Signal extends DelayUnlockDevice {
* 是否封锁
*/
private boolean blockade;
/**
* 是否钮封
*/
private boolean buttonBlockade;
/**
* 重复封锁
* 重复封锁（*后期去掉*）
*/
private boolean reblockade;
/**
@ -240,6 +244,7 @@ public class Signal extends DelayUnlockDevice {
this.lockedRoute = null;
this.level = LEVEL_Close;
this.blockade = false;
this.buttonBlockade=false;
this.reblockade = false;
this.fpl = false;
this.logicLight = this.isCtc();

8
src/main/java/club/joylink/rtss/vo/map/RealLineConfigVO.java
View File

@ -220,6 +220,14 @@ public class RealLineConfigVO {
* 大铁线路
*/
private boolean railway;
/**
* 对信号机封锁操作，是否影响信号显示
* <p>
* true-封锁信号机，会使信号机显示禁止色<br>
* false-封锁信号机，不会影响信号机显示。
*/
private boolean signalBolckOptReflectSignal=true;
/**
* 区故解只能应用于故障锁闭区段