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:
walker-sheng 2021-07-23 09:29:12 +08:00
parent edb3a43cb5
commit 450c33ea74
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/RouteStatus.java
View File

@ -88,6 +88,23 @@ public class RouteStatus extends DeviceStatus {
this.checkConflict = route.isCheckConflict(); this.checkConflict = route.isCheckConflict();
} }
@Override
public DeviceStatusVO convert2VO(MapElement device) {
RouteStatusVO statusVO = new RouteStatusVO((Route) device);
statusVO.setCbtcMode(cbtcMode);
statusVO.setAtsControl(atsControl);
statusVO.setFleetMode(fleetMode);
statusVO.setCiControl(ciControl);
statusVO.setSettable(settable);
statusVO.setSetting(setting);
statusVO.setSettingGuide(settingGuide);
statusVO.setLock(lock);
statusVO.setCanceling(canceling);
statusVO.setNormalUnlock(normalUnlock);
statusVO.setCheckConflict(checkConflict);
return statusVO;
}
@Override @Override
public boolean compareAndChange(MapElement device, DeviceStatusVO statusVO) { public boolean compareAndChange(MapElement device, DeviceStatusVO statusVO) {
Route route = (Route) device; Route route = (Route) device;
@ -158,20 +175,4 @@ public class RouteStatus extends DeviceStatus {
return change; return change;
} }
@Override
public DeviceStatusVO convert2VO(MapElement device) {
RouteStatusVO statusVO = new RouteStatusVO((Route) device);
statusVO.setNormalUnlock(normalUnlock);
statusVO.setCanceling(canceling);
statusVO.setLock(lock);
statusVO.setSettingGuide(settingGuide);
statusVO.setSettable(settable);
statusVO.setSetting(setting);
statusVO.setCiControl(ciControl);
statusVO.setFleetMode(fleetMode);
statusVO.setAtsControl(atsControl);
statusVO.setCbtcMode(cbtcMode);
return statusVO;
}
} }