From 29704ccb6651cfc2e703a988317f05b348fb65d4 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Mon, 28 Nov 2022 13:28:36 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I5ULVA=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=B8=8D=E8=A7=84=E8=8C=83=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?chain=E7=9A=84name=E5=92=8Cid=E6=B7=B7=E7=94=A8=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=A4=AA=E4=B8=A5=E8=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/flow/element/condition/FinallyCondition.java | 2 +- .../yomahub/liteflow/flow/element/condition/ForCondition.java | 2 +- .../yomahub/liteflow/flow/element/condition/IfCondition.java | 4 ++-- .../yomahub/liteflow/flow/element/condition/PreCondition.java | 2 +- .../liteflow/flow/element/condition/ThenCondition.java | 2 +- .../liteflow/flow/element/condition/WhenCondition.java | 4 ++-- .../liteflow/flow/element/condition/WhileCondition.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/FinallyCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/FinallyCondition.java index e45cb3775..eb50fa43e 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/FinallyCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/FinallyCondition.java @@ -20,7 +20,7 @@ public class FinallyCondition extends Condition { @Override public void execute(Integer slotIndex) throws Exception { for(Executable executableItem : this.getExecutableList()){ - executableItem.setCurrChainName(this.getCurrChainName()); + executableItem.setCurrChainId(this.getCurrChainId()); executableItem.execute(slotIndex); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java index 33e301632..df6161bb7 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ForCondition.java @@ -29,7 +29,7 @@ public class ForCondition extends LoopCondition{ } //执行forCount组件 - forNode.setCurrChainName(this.getCurrChainName()); + forNode.setCurrChainId(this.getCurrChainId()); forNode.execute(slotIndex); //这里可能会有spring代理过的bean，所以拿到user原始的class diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/IfCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/IfCondition.java index 503600df0..3bd15e5b3 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/IfCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/IfCondition.java @@ -28,7 +28,7 @@ public class IfCondition extends Condition { public void execute(Integer slotIndex) throws Exception { if (ListUtil.toList(NodeTypeEnum.IF, NodeTypeEnum.IF_SCRIPT).contains(getIfNode().getType())){ //先执行IF节点 - this.getIfNode().setCurrChainName(this.getCurrChainName()); + this.getIfNode().setCurrChainId(this.getCurrChainId()); this.getIfNode().execute(slotIndex); Slot slot = DataBus.getSlot(slotIndex); @@ -63,7 +63,7 @@ public class IfCondition extends Condition { } //执行falseCaseExecutableItem - falseCaseExecutableItem.setCurrChainName(this.getCurrChainName()); + falseCaseExecutableItem.setCurrChainId(this.getCurrChainId()); falseCaseExecutableItem.execute(slotIndex); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/PreCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/PreCondition.java index 6b98b77ac..e793c3b91 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/PreCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/PreCondition.java @@ -20,7 +20,7 @@ public class PreCondition extends Condition { @Override public void execute(Integer slotIndex) throws Exception { for(Executable executableItem : this.getExecutableList()){ - executableItem.setCurrChainName(this.getCurrChainName()); + executableItem.setCurrChainId(this.getCurrChainId()); executableItem.execute(slotIndex); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java index d07b0d64f..394bc937c 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/ThenCondition.java @@ -27,7 +27,7 @@ public class ThenCondition extends Condition { if (executableItem instanceof PreCondition || executableItem instanceof FinallyCondition){ continue; } - executableItem.setCurrChainName(this.getCurrChainName()); + executableItem.setCurrChainId(this.getCurrChainId()); executableItem.execute(slotIndex); } } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java index 61e066707..4fc1037ee 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhenCondition.java @@ -65,7 +65,7 @@ public class WhenCondition extends Condition { private void executeAsyncCondition(Integer slotIndex) throws Exception{ Slot slot = DataBus.getSlot(slotIndex); - String currChainName = this.getCurrChainName(); + String currChainName = this.getCurrChainId(); //此方法其实只会初始化一次Executor，不会每次都会初始化。Executor是唯一的 ExecutorService parallelExecutor = ExecutorHelper.loadInstance().buildWhenExecutor(this.getThreadExecutorClass()); @@ -93,7 +93,7 @@ public class WhenCondition extends Condition { return false; } }).map(executable -> CompletableFutureTimeout.completeOnTimeout( - WhenFutureObj.timeOut(executable.getExecuteName()), + WhenFutureObj.timeOut(executable.getExecuteId()), CompletableFuture.supplyAsync(new ParallelSupplier(executable, currChainName, slotIndex), parallelExecutor), liteflowConfig.getWhenMaxWaitSeconds(), TimeUnit.SECONDS diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java index 60d7d353c..a58249011 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/WhileCondition.java @@ -36,7 +36,7 @@ public class WhileCondition extends LoopCondition{ executableItem.execute(slotIndex); //如果break组件不为空，则去执行 if (ObjectUtil.isNotNull(breakNode)){ - breakNode.setCurrChainName(this.getCurrChainName()); + breakNode.setCurrChainId(this.getCurrChainId()); breakNode.execute(slotIndex); Class originalBreakClass = LiteFlowProxyUtil.getUserClass(this.breakNode.getInstance().getClass()); boolean isBreak = slot.getBreakResult(originalBreakClass.getName());