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:
weizhihong 2022-08-04 16:49:51 +08:00
parent bf22dac447
commit 26f96fed02
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/club/joylink/rtss/simulation/cbtc/data/storage/StorageSimulation.java
View File

@ -63,6 +63,9 @@ public class StorageSimulation {
this.planLoaded = simulation.isPlanLoaded(); this.planLoaded = simulation.isPlanLoaded();
this.repository = new StorageSimulationDataRepository(simulation.getRepository(), script); this.repository = new StorageSimulationDataRepository(simulation.getRepository(), script);
this.ctcDataRepository = new StorageSimulationCtcDataRepository(simulation.getCtcRepository()); this.ctcDataRepository = new StorageSimulationCtcDataRepository(simulation.getCtcRepository());
if (!this.ctcDataRepository.isNotEmpty()) {
this.ctcDataRepository = null;
}
} }
public void recover2Simulation(Simulation simulation) { public void recover2Simulation(Simulation simulation) {

2
src/main/java/club/joylink/rtss/simulation/cbtc/data/storage/StorageSimulationDataRepository.java
View File

@ -289,8 +289,10 @@ public class StorageSimulationDataRepository {
this.usedTrainList = tempUsedTrainList; this.usedTrainList = tempUsedTrainList;
} }
// 有状态的进路列表 // 有状态的进路列表
if (!repository.getSettingRouteMap().isEmpty()) {
this.settingRouteList = new ArrayList<>(repository.getSettingRouteMap().keySet()); this.settingRouteList = new ArrayList<>(repository.getSettingRouteMap().keySet());
} }
}
public void recover2Simulation(Simulation simulation, SimulationDataRepository repository) { public void recover2Simulation(Simulation simulation, SimulationDataRepository repository) {
// 恢复地图设备状态 // 恢复地图设备状态

7
src/main/java/club/joylink/rtss/simulation/cbtc/data/storage/ctc/StorageSimulationCtcDataRepository.java
View File

@ -159,4 +159,11 @@ public class StorageSimulationCtcDataRepository {
this.dispatchCommandList.forEach(command -> repository.addDispatchCommand(command.recover2Simulation(simulation))); this.dispatchCommandList.forEach(command -> repository.addDispatchCommand(command.recover2Simulation(simulation)));
} }
} }
public boolean isNotEmpty() {
return this.storageCtcZoneData != null || this.storageCtcEffectData != null || this.runPlanLogList != null
|| this.routeSequenceMap != null || this.ticketId != null || this.railTicketList != null
|| this.greenLicensesList != null || this.redLicenseList != null || this.dispatchCommandId != null
|| this.dispatchCommandList != null;
}
} }

5
src/main/java/club/joylink/rtss/simulation/cbtc/data/storage/device/StorageSignal.java
View File

@ -4,7 +4,6 @@ import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.constant.SignalAspect; import club.joylink.rtss.simulation.cbtc.constant.SignalAspect;
import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository; import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository;
import club.joylink.rtss.simulation.cbtc.data.map.MapElement; import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
import club.joylink.rtss.simulation.cbtc.data.map.MayOutOfOrderDevice;
import club.joylink.rtss.simulation.cbtc.data.map.Route; import club.joylink.rtss.simulation.cbtc.data.map.Route;
import club.joylink.rtss.simulation.cbtc.data.map.Signal; import club.joylink.rtss.simulation.cbtc.data.map.Signal;
import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer; import club.joylink.rtss.util.jsonSerialize.Boolean2NumDeserializer;
@ -105,7 +104,7 @@ public class StorageSignal extends StorageDelayUnlockDevice {
change = true; change = true;
this.setBlockade(signal.isBlockade()); this.setBlockade(signal.isBlockade());
} }
if (signal.getLevel() != 1) { if (signal.getLevel() != 1 && signal.getLevel() != 0) {
change = true; change = true;
this.setLevel(signal.getLevel()); this.setLevel(signal.getLevel());
} }
@ -117,7 +116,7 @@ public class StorageSignal extends StorageDelayUnlockDevice {
change = true; change = true;
this.setFpl(signal.isFpl()); this.setFpl(signal.isFpl());
} }
if (!signal.isLogicLight()) { if (signal.isLogicLight()) {
change = true; change = true;
this.setLogicLight(signal.isLogicLight()); this.setLogicLight(signal.isLogicLight());
} }