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 2023-02-20 15:05:35 +08:00
parent eb81ea59dc
commit b5c6f7a9a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/club/joylink/rtss/simulation/cbtc/robot/SimulationRobotService.java
View File

@ -467,8 +467,14 @@ public class SimulationRobotService {
if (training2 != null && training2.isScene() && StringUtils.hasText(training2.getBgSceneJson()) && !training2.isRunning()) { if (training2 != null && training2.isScene() && StringUtils.hasText(training2.getBgSceneJson()) && !training2.isRunning()) {
return; return;
} }
if (simulation.getBuildParams().getWorkParamVO().getDomConfig().isJoint()) { // 综合演练
return;
}
simulation.getRepository().getStationList().stream() simulation.getRepository().getStationList().stream()
.filter(station -> station.getOperationModeApplication() != null && station.getOperationModeApplication().isRobotApproval()) // 申请不为空、距离申请时间超过5s、审批人全部为机器人
.filter(station -> station.getOperationModeApplication() != null
&& simulation.getCorrectSystemTime().isAfter(station.getOperationModeApplication().getApplyDateTime().plusSeconds(5))
&& station.getOperationModeApplication().isRobotApproval())
.forEach(station -> atsStationService.doOperationModeSwitch(station)); .forEach(station -> atsStationService.doOperationModeSwitch(station));
} }