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 2022-09-29 15:10:42 +08:00
parent 23d116c060
commit 435758678c
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/club/joylink/rtss/simulation/cbtc/ISCS/IscsLogicLoop.java
View File

@ -10,8 +10,10 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapConfig;
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.Stand; import club.joylink.rtss.simulation.cbtc.data.map.Stand;
import club.joylink.rtss.simulation.cbtc.data.map.Station; import club.joylink.rtss.simulation.cbtc.data.map.Station;
import club.joylink.rtss.simulation.cbtc.data.vo.iscs.*; import club.joylink.rtss.simulation.cbtc.data.vo.iscs.IscsIbpStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityGate; import club.joylink.rtss.simulation.cbtc.data.vo.iscs.IscsPsdStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.iscs.IscsPslStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vo.iscs.IscsStatusVO;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityIbp; import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityIbp;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityPsl; import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityPsl;
import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityScreenDoor; import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityScreenDoor;
@ -143,19 +145,19 @@ public class IscsLogicLoop {
boolean change = iscsPslStatusVO.compareAndChange(upPsl, downPsl); boolean change = iscsPslStatusVO.compareAndChange(upPsl, downPsl);
if (change) iscsPslStatusVO.fireWatcher(null, null); if (change) iscsPslStatusVO.fireWatcher(null, null);
} }
//GATE // //GATE 改为闸机状态由前端决定，故注释这段代码
VirtualRealityGate vrGate = station.getVrGate(); // VirtualRealityGate vrGate = station.getVrGate();
IscsGateStatusVO iscsGateStatusVO = (IscsGateStatusVO) statusVOMap.get(vrGate.getCode()); // IscsGateStatusVO iscsGateStatusVO = (IscsGateStatusVO) statusVOMap.get(vrGate.getCode());
if (iscsGateStatusVO == null) { // if (iscsGateStatusVO == null) {
iscsGateStatusVO = new IscsGateStatusVO(vrGate.getCode(), station.getCode(), vrGate); // iscsGateStatusVO = new IscsGateStatusVO(vrGate.getCode(), station.getCode(), vrGate);
IscsStatusPublisher watcher = simulation.getMessagePublisher(IscsStatusPublisher.NAME, IscsStatusPublisher.class); // IscsStatusPublisher watcher = simulation.getMessagePublisher(IscsStatusPublisher.NAME, IscsStatusPublisher.class);
simulation.watch(iscsGateStatusVO, watcher); // simulation.watch(iscsGateStatusVO, watcher);
statusVOMap.put(iscsGateStatusVO.getCode(), iscsGateStatusVO); // statusVOMap.put(iscsGateStatusVO.getCode(), iscsGateStatusVO);
iscsGateStatusVO.fireWatcher(null, null); // iscsGateStatusVO.fireWatcher(null, null);
} else { // } else {
boolean change = iscsGateStatusVO.compareAndChange(vrGate); // boolean change = iscsGateStatusVO.compareAndChange(vrGate);
if (change) iscsGateStatusVO.fireWatcher(null, null); // if (change) iscsGateStatusVO.fireWatcher(null, null);
} // }
} }
} }