joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
joylink_zhangsai 2023-05-09 17:21:40 +08:00
commit dd1238d607
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/club/joylink/rtss/simulation/cbtc/ATS/data/StationDiagram.java
View File

@ -17,21 +17,21 @@ public class StationDiagram {
public StationDiagram(VirtualRealityTrain train){ public StationDiagram(VirtualRealityTrain train){
this.groupNum = train.getGroupNumber(); this.groupNum = train.getGroupNumber();
this.right = train.isRight(); this.right = train.isRight();
this.stationComplateRatio = 0F; this.stationCompleteRatio = 0F;
this.finalStation = false; this.finalStation = false;
} }
public StationDiagram(VirtualRealityTrain train,Float stationComplateRatio, Boolean finalStation){ public StationDiagram(VirtualRealityTrain train,Float stationComplateRatio, Boolean finalStation){
this.groupNum = train.getGroupNumber(); this.groupNum = train.getGroupNumber();
this.right = train.isRight(); this.right = train.isRight();
this.stationComplateRatio = stationComplateRatio; this.stationCompleteRatio = stationComplateRatio;
this.finalStation = finalStation; this.finalStation = finalStation;
} }
public StationDiagram(VirtualRealityTrain train,boolean showTrainDiagram,Float stationComplateRatio, Boolean finalStation){ public StationDiagram(VirtualRealityTrain train,boolean showTrainDiagram,Float stationComplateRatio, Boolean finalStation){
this.groupNum = train.getGroupNumber(); this.groupNum = train.getGroupNumber();
this.right = train.isRight(); this.right = train.isRight();
this.stationComplateRatio = stationComplateRatio; this.stationCompleteRatio = stationComplateRatio;
this.finalStation = finalStation; this.finalStation = finalStation;
this.showTrainDiagram = showTrainDiagram; this.showTrainDiagram = showTrainDiagram;
} }
@ -48,7 +48,7 @@ public class StationDiagram {
/** /**
* 运行完成度 * 运行完成度
*/ */
private Float stationComplateRatio; private Float stationCompleteRatio;
/** /**
* 是否到达终点车站 * 是否到达终点车站

4
src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java
View File

@ -212,10 +212,10 @@ public class SimulationServiceImpl implements SimulationService {
@Override @Override
public String createSimulation(Long mapFunctionId, LoginUserInfoVO loginInfo) { public String createSimulation(Long mapFunctionId, LoginUserInfoVO loginInfo) {
MapFunctionVO mapFunctionVO = rtsMapFunctionService.get(mapFunctionId); MapFunctionVO mapFunctionVO = rtsMapFunctionService.get(mapFunctionId);
String group = this.checkUserExistSimulation(mapFunctionVO,loginInfo.getAccountVO()); /* String group = this.checkUserExistSimulation(mapFunctionVO,loginInfo.getAccountVO());
if(StringUtils.isNotEmpty(group)){ if(StringUtils.isNotEmpty(group)){
return group; return group;
} }*/
Long mapId = mapFunctionVO.getMapId(); Long mapId = mapFunctionVO.getMapId();
Map<String,Boolean> createUserType = this.checkUserPermission(mapFunctionVO,loginInfo); Map<String,Boolean> createUserType = this.checkUserPermission(mapFunctionVO,loginInfo);
SimulationWorkParamVO workParamVO = mapFunctionVO.getParamVO(); SimulationWorkParamVO workParamVO = mapFunctionVO.getParamVO();