diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/StationDiagram.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/StationDiagram.java index 29a2a2026..c3685b998 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/StationDiagram.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/StationDiagram.java @@ -17,21 +17,21 @@ public class StationDiagram { public StationDiagram(VirtualRealityTrain train){ this.groupNum = train.getGroupNumber(); this.right = train.isRight(); - this.stationComplateRatio = 0F; + this.stationCompleteRatio = 0F; this.finalStation = false; } public StationDiagram(VirtualRealityTrain train,Float stationComplateRatio, Boolean finalStation){ this.groupNum = train.getGroupNumber(); this.right = train.isRight(); - this.stationComplateRatio = stationComplateRatio; + this.stationCompleteRatio = stationComplateRatio; this.finalStation = finalStation; } public StationDiagram(VirtualRealityTrain train,boolean showTrainDiagram,Float stationComplateRatio, Boolean finalStation){ this.groupNum = train.getGroupNumber(); this.right = train.isRight(); - this.stationComplateRatio = stationComplateRatio; + this.stationCompleteRatio = stationComplateRatio; this.finalStation = finalStation; this.showTrainDiagram = showTrainDiagram; } @@ -48,7 +48,7 @@ public class StationDiagram { /** * 运行完成度 */ - private Float stationComplateRatio; + private Float stationCompleteRatio; /** * 是否到达终点车站 diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java b/src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java index a2c9f8831..59ed12781 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java @@ -212,10 +212,10 @@ public class SimulationServiceImpl implements SimulationService { @Override public String createSimulation(Long mapFunctionId, LoginUserInfoVO loginInfo) { MapFunctionVO mapFunctionVO = rtsMapFunctionService.get(mapFunctionId); - String group = this.checkUserExistSimulation(mapFunctionVO,loginInfo.getAccountVO()); +/* String group = this.checkUserExistSimulation(mapFunctionVO,loginInfo.getAccountVO()); if(StringUtils.isNotEmpty(group)){ return group; - } + }*/ Long mapId = mapFunctionVO.getMapId(); Map createUserType = this.checkUserPermission(mapFunctionVO,loginInfo); SimulationWorkParamVO workParamVO = mapFunctionVO.getParamVO();