From b5c6f7a9a223078f6fab0d2bf2c1c91b80122bfe Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 20 Feb 2023 15:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=BD=AC=E6=8D=A2=E4=B8=8D=E5=86=8D=E5=81=9A?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=8C=E6=84=8F=E6=93=8D=E4=BD=9C=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulation/cbtc/robot/SimulationRobotService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/robot/SimulationRobotService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/robot/SimulationRobotService.java index 2e7c29e0e..55b39b643 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/robot/SimulationRobotService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/robot/SimulationRobotService.java @@ -467,8 +467,14 @@ public class SimulationRobotService { if (training2 != null && training2.isScene() && StringUtils.hasText(training2.getBgSceneJson()) && !training2.isRunning()) { return; } + if (simulation.getBuildParams().getWorkParamVO().getDomConfig().isJoint()) { // 综合演练 + return; + } 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)); }