From 76493869dbd6fbfd8d57de06877d0a09e827e114 Mon Sep 17 00:00:00 2001 From: bryan31 Date: Thu, 9 Dec 2021 13:15:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Parser=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yomahub/liteflow/parser/JsonFlowParser.java | 2 ++ .../java/com/yomahub/liteflow/parser/XmlFlowParser.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java index 17d987a30..10d7730a1 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/JsonFlowParser.java @@ -191,6 +191,8 @@ public abstract class JsonFlowParser extends FlowParser { condition.setAny(any.equals(Boolean.TRUE.toString())); condition.setConditionType(condType); condition.setNodeList(chainNodeList); + + //这里把condition组装进conditionList，根据参数有些condition要和conditionList里面的某些进行合并操作 super.buildConditions(conditionList, condition); } FlowBus.addChain(chainName, new Chain(chainName, conditionList)); diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java index 038c2437b..804b7cc7d 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/XmlFlowParser.java @@ -156,8 +156,8 @@ public abstract class XmlFlowParser extends FlowParser { String itemExpression; RegexNodeEntity item; //这里解析的规则，优先按照node去解析，再按照chain去解析 - for (int i = 0; i < condArray.length; i++) { - itemExpression = condArray[i].trim(); + for (String s : condArray) { + itemExpression = s.trim(); regexEntity = RegexEntity.parse(itemExpression); item = regexEntity.getItem(); if (FlowBus.containNode(item.getId())) { @@ -190,6 +190,8 @@ public abstract class XmlFlowParser extends FlowParser { condition.setAny(any.equals(Boolean.TRUE.toString())); condition.setConditionType(condE.getName()); condition.setNodeList(chainNodeList); + + //这里把condition组装进conditionList，根据参数有些condition要和conditionList里面的某些进行合并操作 super.buildConditions(conditionList, condition); } FlowBus.addChain(chainName, new Chain(chainName, conditionList));