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-training2' into test-training2

Browse Source
This commit is contained in:
joylink_zhangsai 2023-02-20 17:26:46 +08:00
commit e7b817c2d4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,12 @@ 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().isSingleMember()) {
return;
}
simulation.getRepository().getStationList().stream() simulation.getRepository().getStationList().stream()
// 申请不为空、审批人全部为机器人
.filter(station -> station.getOperationModeApplication() != null && station.getOperationModeApplication().isRobotApproval()) .filter(station -> station.getOperationModeApplication() != null && station.getOperationModeApplication().isRobotApproval())
.forEach(station -> atsStationService.doOperationModeSwitch(station)); .forEach(station -> atsStationService.doOperationModeSwitch(station));
} }