diff --git a/src/main/java/com/example/liteflow/mysql/cmp/CenterCmp.java b/src/main/java/com/example/liteflow/mysql/cmp/CenterCmp.java index da37502..86ef764 100644 --- a/src/main/java/com/example/liteflow/mysql/cmp/CenterCmp.java +++ b/src/main/java/com/example/liteflow/mysql/cmp/CenterCmp.java @@ -13,7 +13,7 @@ import com.example.liteflow.mysql.model.rule.Rule; import com.example.liteflow.mysql.service.BaseDataService; import com.example.liteflow.mysql.service.BaseNodeService; import com.example.liteflow.mysql.util.ConditionParser; -import com.example.liteflow.mysql.util.RoleUtil; +import com.example.liteflow.mysql.util.RuleUtil; import com.googlecode.aviator.AviatorEvaluator; import com.yomahub.liteflow.core.NodeIfComponent; import lombok.extern.slf4j.Slf4j; @@ -48,12 +48,12 @@ public class CenterCmp extends NodeIfComponent { String nodeName = this.getName(); log.info("nodeId = {}, nodeName = {}", nodeId, nodeName); BaseNodeEntity baseNodeEntity = baseNodeService.getByNodeId(nodeId); - if (ObjectUtil.isNotNull(baseNodeEntity) && StrUtil.isNotBlank(baseNodeEntity.getNodeRole())) { - String nodeRole = baseNodeEntity.getNodeRole(); + if (ObjectUtil.isNotNull(baseNodeEntity) && StrUtil.isNotBlank(baseNodeEntity.getNodeRule())) { + String nodeRule = baseNodeEntity.getNodeRule(); String templateId = baseNodeEntity.getTemplateId(); - log.info("nodeRole = {}", nodeRole); - List rules = JSONUtil.toList(JSONUtil.parseArray(nodeRole), Rule.class); - List> collect = rules.stream().map(RoleUtil::parseRole).collect(Collectors.toList()); + log.info("nodeRule = {}", nodeRule); + List rules = JSONUtil.toList(JSONUtil.parseArray(nodeRule), Rule.class); + List> collect = rules.stream().map(RuleUtil::parseRule).collect(Collectors.toList()); String droolStr = JSONUtil.toJsonStr(collect); // 替换规则中的关键字 diff --git a/src/main/java/com/example/liteflow/mysql/entity/BaseNodeEntity.java b/src/main/java/com/example/liteflow/mysql/entity/BaseNodeEntity.java index 8da3d13..9f6d5da 100644 --- a/src/main/java/com/example/liteflow/mysql/entity/BaseNodeEntity.java +++ b/src/main/java/com/example/liteflow/mysql/entity/BaseNodeEntity.java @@ -53,8 +53,8 @@ public class BaseNodeEntity { /** * 节点规则 */ - @TableField("node_role") - private String nodeRole; + @TableField("node_rule") + private String nodeRule; /** * 节点对应输出节点id */ diff --git a/src/main/java/com/example/liteflow/mysql/model/node/BaseNodeVO.java b/src/main/java/com/example/liteflow/mysql/model/node/BaseNodeVO.java index b488e25..18d38e2 100644 --- a/src/main/java/com/example/liteflow/mysql/model/node/BaseNodeVO.java +++ b/src/main/java/com/example/liteflow/mysql/model/node/BaseNodeVO.java @@ -48,7 +48,7 @@ public class BaseNodeVO { /** * 节点规则 */ - private String nodeRole; + private String nodeRule; /** * 节点对应输出节点id */ diff --git a/src/main/java/com/example/liteflow/mysql/service/impl/BaseNodeServiceImpl.java b/src/main/java/com/example/liteflow/mysql/service/impl/BaseNodeServiceImpl.java index 1e86154..d5baa15 100644 --- a/src/main/java/com/example/liteflow/mysql/service/impl/BaseNodeServiceImpl.java +++ b/src/main/java/com/example/liteflow/mysql/service/impl/BaseNodeServiceImpl.java @@ -66,7 +66,7 @@ public class BaseNodeServiceImpl extends ServiceImpl rules = createNodeFrom.getRules(); OutputFrom content = createNodeFrom.getContent(); if (CollUtil.isNotEmpty(rules) && NodeEnum.IfNode.getName().equals(nodeType)) { - baseNodeEntity.setNodeRole(JSONUtil.toJsonStr(rules)); + baseNodeEntity.setNodeRule(JSONUtil.toJsonStr(rules)); } else if (ObjectUtil.isNotNull(content) && NodeEnum.CommonNode.getName().equals(nodeType)) { baseNodeEntity.setNodeContent(JSONUtil.toJsonStr(content)); } else { @@ -83,14 +83,14 @@ public class BaseNodeServiceImpl extends ServiceImpl rules = updateNodeFrom.getRules(); - String roleStr = ObjectUtil.isNotNull(rules) ? JSONUtil.toJsonStr(rules) : ""; + String ruleStr = ObjectUtil.isNotNull(rules) ? JSONUtil.toJsonStr(rules) : ""; OutputFrom content = updateNodeFrom.getContent(); String contentStr = ObjectUtil.isNotNull(content) ? JSONUtil.toJsonStr(content) : ""; LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(BaseNodeEntity::getId, id) .set(BaseNodeEntity::getEnableMark, enableMark) .set(StrUtil.isNotBlank(contentStr), BaseNodeEntity::getNodeContent, contentStr) - .set(StrUtil.isNotBlank(roleStr), BaseNodeEntity::getNodeRole, roleStr) + .set(StrUtil.isNotBlank(ruleStr), BaseNodeEntity::getNodeRule, ruleStr) .set(StrUtil.isNotBlank(nodeContentId), BaseNodeEntity::getNodeContentId, nodeContentId); try { this.update(updateWrapper); diff --git a/src/main/java/com/example/liteflow/mysql/util/RoleUtil.java b/src/main/java/com/example/liteflow/mysql/util/RuleUtil.java similarity index 96% rename from src/main/java/com/example/liteflow/mysql/util/RoleUtil.java rename to src/main/java/com/example/liteflow/mysql/util/RuleUtil.java index b5279bd..15a5987 100644 --- a/src/main/java/com/example/liteflow/mysql/util/RoleUtil.java +++ b/src/main/java/com/example/liteflow/mysql/util/RuleUtil.java @@ -14,14 +14,14 @@ import java.util.stream.Collectors; * @author: 陈韦龙 * @date: 2022年12月08日 15:37 */ -public class RoleUtil { +public class RuleUtil { /** * 规则解析 * * @param rule 规则 * @return Map */ - public static Map parseRole(Rule rule) { + public static Map parseRule(Rule rule) { List matchList = rule.getMatches(); List ruleChildren = rule.getChildren(); String logicOperators = rule.getLogicOperators(); @@ -31,7 +31,7 @@ public class RoleUtil { List sunList = child.getChildren(); // 存在子嵌套子的情况 if (CollUtil.isNotEmpty(sunList)) { - List> sunCollect = sunList.stream().map(RoleUtil::parseRole).collect(Collectors.toList()); + List> sunCollect = sunList.stream().map(RuleUtil::parseRule).collect(Collectors.toList()); String childLogicOperators = child.getLogicOperators(); Map itemMap = new HashMap<>(); itemMap.put(childLogicOperators, sunCollect); diff --git a/src/test/java/MyTest.java b/src/test/java/MyTest.java index cacfac8..bbf6701 100644 --- a/src/test/java/MyTest.java +++ b/src/test/java/MyTest.java @@ -51,7 +51,7 @@ public class MyTest { rules.add(rule); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -92,7 +92,7 @@ public class MyTest { rules.add(rule); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -113,7 +113,7 @@ public class MyTest { rule.setMatches(matches); List rules = Lists.newArrayList(rule); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -138,7 +138,7 @@ public class MyTest { rule.setMatches(matches); List rules = Lists.newArrayList(rule); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -153,7 +153,7 @@ public class MyTest { List rules = Lists.newArrayList(rule); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -205,7 +205,7 @@ public class MyTest { List rules = Lists.newArrayList(rule, rule2); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -247,8 +247,8 @@ public class MyTest { rule.setChildren(children); List rules = Lists.newArrayList(rule); -// System.out.println(JSONUtil.toJsonStr(roles)); -// List> collect = roles.stream().map(this::parseRole).collect(Collectors.toList()); +// System.out.println(JSONUtil.toJsonStr(rules)); +// List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); // System.out.println(JSONUtil.toJsonStr(collect)); } @@ -294,7 +294,7 @@ public class MyTest { List rules = Lists.newArrayList(rule, rule2); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -351,7 +351,7 @@ public class MyTest { List rules = Lists.newArrayList(rule, rule2); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } @@ -402,10 +402,10 @@ public class MyTest { List rules = Lists.newArrayList(rule, rule2); System.out.println(JSONUtil.toJsonStr(rules)); - List> collect = rules.stream().map(this::parseRole).collect(Collectors.toList()); + List> collect = rules.stream().map(this::parseRule).collect(Collectors.toList()); System.out.println(JSONUtil.toJsonStr(collect)); } - private Map parseRole(Rule rule) { + private Map parseRule(Rule rule) { List matchList = rule.getMatches(); List ruleChildren = rule.getChildren(); String logicOperators = rule.getLogicOperators(); @@ -413,7 +413,7 @@ public class MyTest { List> collect = ruleChildren.stream().map(child -> { List sunList = child.getChildren(); if (CollUtil.isNotEmpty(sunList)) { - List> sunCollect = sunList.stream().map(this::parseRole).collect(Collectors.toList()); + List> sunCollect = sunList.stream().map(this::parseRule).collect(Collectors.toList()); String childLogicOperators = child.getLogicOperators(); Map itemMap = new HashMap<>(); itemMap.put(childLogicOperators, sunCollect);