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:
weizhihong 2022-08-29 10:37:04 +08:00
parent 8c3293ae68
commit 5b9423cf8e
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/club/joylink/rtss/services/training2/Training2Service.java
View File

@ -303,7 +303,32 @@ public class Training2Service {
*/ */
public Integer completionClientStepOperation(String group, Integer stepId public Integer completionClientStepOperation(String group, Integer stepId
, Integer id, AccountVO user) { , Integer id, AccountVO user) {
return null; Simulation simulation = groupSimulationCache.getSimulationByGroup(group);
if (simulation == null) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "仿真不存在");
}
Training2 training2 = simulation.getTraining2();
if (training2 == null) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "实训数据不存在");
}
Step2 step = training2.getSteps().stream().filter(s -> Objects.equals(s.getId(), stepId))
.findFirst().orElse(null);
if (step == null) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "不存在步骤");
}
if (Objects.equals(user.getId(), step.getSimulationMember().getId())) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "无权限操作");
}
Operation2 operation = step.getOperations().stream().filter(o -> Objects.equals(o.getId(), id))
.findFirst().orElse(null);
if (operation == null) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "不存在操作");
}
operation.doOperated();
operation.checkCompletion();
// 恢复前端运行
pauseOrStartSimulation(simulation, false);
return 1;
} }
@Async("trainingV2Executor") @Async("trainingV2Executor")
@ -411,8 +436,14 @@ public class Training2Service {
simulationLifeCycleService.pause(simulation); simulationLifeCycleService.pause(simulation);
// 重置仿真状态 // 重置仿真状态
groupSimulationService.planOver(group); groupSimulationService.planOver(group);
if (!StringUtils.isEmpty(draftTraining2.getBgSceneJson())) { // 场景的时候加载最后背景
groupSimulationService.loadScenes(simulation.getId(), draftTraining2.getBgSceneJson()); String bgSceneJson = draftTraining2.getBgSceneJson();
if (Training2.Type.SCENE.name().equals(draftTraining2.getType())) {
bgSceneJson = StringUtils.isEmpty(draftTraining2.getFinalScenesJson()) ? bgSceneJson
: draftTraining2.getFinalScenesJson();
}
if (!StringUtils.isEmpty(bgSceneJson)) {
groupSimulationService.loadScenes(simulation.getId(), bgSceneJson);
} }
} }