From 6cf11c5b24bf3c56710876bdf383a9aac4ecf216 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Wed, 27 Nov 2024 17:11:05 +0800 Subject: [PATCH] =?UTF-8?q?bug=20#IB7EQJ=20SWITCH=E5=90=8E=E7=9A=84target?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=8A=A0=E4=BA=86maxWaitMilliseconds?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=80=89=E4=B8=8D=E5=88=B0=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/builder/el/operator/MaxWaitTimeOperator.java | 2 ++ .../test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java | 5 +++++ .../src/test/resources/maxWaitSeconds/flow.el.xml | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java index fb5bdfd13..6ca3fd3ec 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/operator/MaxWaitTimeOperator.java @@ -65,6 +65,8 @@ public abstract class MaxWaitTimeOperator extends BaseOperator { timeoutCondition.addExecutable(executable); timeoutCondition.setMaxWaitTime(maxWaitTime); timeoutCondition.setMaxWaitTimeUnit(getMaxWaitTimeUnit()); + timeoutCondition.setId(executable.getId()); + timeoutCondition.setTag(executable.getTag()); return timeoutCondition; } diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java index 611e39c17..1976909bf 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsELSpringbootTest.java @@ -111,6 +111,11 @@ public class MaxWaitSecondsELSpringbootTest extends BaseTest { assertNotTimeout("switch2"); } + @Test + public void testSwitch3() { + assertNotTimeout("switch3"); + } + // 测试 IF 的超时情况 @Test public void testIf1() { diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml index 17edf5a01..e8b8d3442 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/maxWaitSeconds/flow.el.xml @@ -62,6 +62,11 @@ SWITCH(s).TO(a, b).maxWaitSeconds(3); + + + SWITCH(s).TO(a.maxWaitSeconds(3), b.maxWaitSeconds(2)); + +