From b5c6f7a9a223078f6fab0d2bf2c1c91b80122bfe Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 20 Feb 2023 15:05:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=BB=BC=E5=90=88=E6=BC=94?= =?UTF-8?q?=E7=BB=83=E6=A8=A1=E5=BC=8F=E8=BD=AC=E6=8D=A2=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=81=9A=E8=87=AA=E5=8A=A8=E5=90=8C=E6=84=8F=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=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)); } From 2719d30267a0e65cab92878de1462f53f18f7e0a Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 20 Feb 2023 15:46:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=B0=86=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=BD=AC=E6=8D=A2=E8=87=AA=E5=8A=A8=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=BB=B6=E8=BF=9F10s=E5=90=8C=E6=84=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/simulation/cbtc/robot/SimulationRobotService.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 50df221dc..7e8ce7eca 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 @@ -470,13 +470,10 @@ 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() - // 申请不为空、距离申请时间超过5s、审批人全部为机器人 + // 申请不为空、距离申请时间超过10s、审批人全部为机器人 .filter(station -> station.getOperationModeApplication() != null - && simulation.getCorrectSystemTime().isAfter(station.getOperationModeApplication().getApplyDateTime().plusSeconds(5)) + && simulation.getCorrectSystemTime().isAfter(station.getOperationModeApplication().getApplyDateTime().plusSeconds(10)) && station.getOperationModeApplication().isRobotApproval()) .forEach(station -> atsStationService.doOperationModeSwitch(station)); } From 5d722f43d9c704c2c6c0846c8c8f0956c8f21860 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 20 Feb 2023 15:59:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=8D=95=E8=A7=92=E8=89=B2=E7=9B=B4=E6=8E=A5=E5=90=8C=E6=84=8F?= =?UTF-8?q?=EF=BC=8C=E5=A4=9A=E8=A7=92=E8=89=B2=E5=88=99=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simulation/cbtc/robot/SimulationRobotService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 7e8ce7eca..f10dc31e8 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 @@ -470,11 +470,13 @@ public class SimulationRobotService { if (training2 != null && training2.isScene() && StringUtils.hasText(training2.getBgSceneJson()) && !training2.isRunning()) { return; } + // 非单岗位一直等待角色同意 + if (!simulation.getBuildParams().getWorkParamVO().getDomConfig().isSingleMember()) { + return; + } simulation.getRepository().getStationList().stream() - // 申请不为空、距离申请时间超过10s、审批人全部为机器人 - .filter(station -> station.getOperationModeApplication() != null - && simulation.getCorrectSystemTime().isAfter(station.getOperationModeApplication().getApplyDateTime().plusSeconds(10)) - && station.getOperationModeApplication().isRobotApproval()) + // 申请不为空、审批人全部为机器人 + .filter(station -> station.getOperationModeApplication() != null && station.getOperationModeApplication().isRobotApproval()) .forEach(station -> atsStationService.doOperationModeSwitch(station)); }