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

Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin

Browse Source
This commit is contained in:
tiger_zhou 2023-03-31 14:50:46 +08:00
commit f6dd8e7a42
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java
View File

@ -776,15 +776,24 @@ public class GroupSimulationServiceImpl implements GroupSimulationService {
// .assertTrue(simulation.isJointSimulation());
// 是否已经获取权限
SimulationUser existSimulationUser = simulation.querySimulationUserById(user.getId().toString());
BusinessExceptionAssertEnum.SIMULATION_PERMISSION_ALREADY_GET
.assertNull(existSimulationUser);
// 用户联机的时候用户直接关闭浏览器，二次联机的时候无法进入的问题 begin
// BusinessExceptionAssertEnum.SIMULATION_PERMISSION_ALREADY_GET.assertNull(existSimulationUser);
// 检查是否还有权限可以使用
// 获取权限，成为仿真用户
SimulationUser simulationUser = new SimulationUser(simulation, user);
simulation.addSimulationUser(simulationUser);
SimulationUserEnterEvent userEnterEvent = new SimulationUserEnterEvent(this, simulation, simulationUser);
this.applicationContext.publishEvent(userEnterEvent);
// SimulationUser simulationUser = new SimulationUser(simulation, user);
// simulation.addSimulationUser(simulationUser);
// SimulationUserEnterEvent userEnterEvent = new SimulationUserEnterEvent(this, simulation, simulationUser);
// this.applicationContext.publishEvent(userEnterEvent);
SimulationUserEnterEvent userEnterEvent;
if(Objects.isNull(existSimulationUser)){
SimulationUser simulationUser = new SimulationUser(simulation, user);
simulation.addSimulationUser(simulationUser);
userEnterEvent = new SimulationUserEnterEvent(this, simulation, simulationUser);
}else{
userEnterEvent = new SimulationUserEnterEvent(this, simulation, existSimulationUser);
}
this.applicationContext.publishEvent(userEnterEvent);
// 用户联机的时候用户直接关闭浏览器，二次联机的时候无法进入的问题 end
return SimulationVO.buildBasicInfo(simulation);
}