From d2d08d6a7acceaaf36b863fdedd8faa3047bfc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=82=85=E5=93=A5?= <184172133@qq.com> Date: Mon, 10 Jul 2023 21:28:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=82=85=E5=93=A5=EF=BC=8Cfeat?= =?UTF-8?q?=EF=BC=9A=E6=9E=B6=E6=9E=84=E7=9A=84=E6=9C=AC=E8=B4=A8=E4=B9=8B?= =?UTF-8?q?=20DDD=20=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../mybatis/mapper/RuleTreeNodeLine_Mapper.xml | 2 +- .../mybatis/mapper/RuleTreeNode_Mapper.xml | 2 +- .../mybatis/mapper/RuleTree_Mapper.xml | 2 +- .../frame/infrastructure/dao/RuleTreeDao.java | 6 +++--- .../infrastructure/dao/RuleTreeNodeDao.java | 6 +++--- .../dao/RuleTreeNodeLineDao.java | 4 ++-- ...NodeLineVO.java => RuleTreeNodeLinePO.java} | 2 +- ...RuleTreeNodeVO.java => RuleTreeNodePO.java} | 2 +- .../po/{RuleTreeVO.java => RuleTreePO.java} | 2 +- .../repository/RuleRepository.java | 18 +++++++++--------- 11 files changed, 24 insertions(+), 24 deletions(-) rename xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/{RuleTreeNodeLineVO.java => RuleTreeNodeLinePO.java} (95%) rename xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/{RuleTreeNodeVO.java => RuleTreeNodePO.java} (96%) rename xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/{RuleTreeVO.java => RuleTreePO.java} (96%) diff --git a/xfg-frame-app/src/main/resources/application-dev.yml b/xfg-frame-app/src/main/resources/application-dev.yml index 09c16c3..21e1053 100644 --- a/xfg-frame-app/src/main/resources/application-dev.yml +++ b/xfg-frame-app/src/main/resources/application-dev.yml @@ -37,7 +37,7 @@ dubbo: address: zookeeper://127.0.0.1:2181 protocol: name: dubbo - port: 20881 + port: 20883 scan: base-packages: cn.bugstack.xfg.frame.api diff --git a/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNodeLine_Mapper.xml b/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNodeLine_Mapper.xml index 239c365..0748a70 100644 --- a/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNodeLine_Mapper.xml +++ b/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNodeLine_Mapper.xml @@ -2,7 +2,7 @@ - + diff --git a/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNode_Mapper.xml b/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNode_Mapper.xml index 7145218..c13a864 100644 --- a/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNode_Mapper.xml +++ b/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTreeNode_Mapper.xml @@ -2,7 +2,7 @@ - + diff --git a/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTree_Mapper.xml b/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTree_Mapper.xml index 9801b99..c8559c4 100644 --- a/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTree_Mapper.xml +++ b/xfg-frame-app/src/main/resources/mybatis/mapper/RuleTree_Mapper.xml @@ -2,7 +2,7 @@ - + diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeDao.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeDao.java index 5aaac5c..106910f 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeDao.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeDao.java @@ -1,5 +1,5 @@ package cn.bugstack.xfg.frame.infrastructure.dao; -import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeVO; +import cn.bugstack.xfg.frame.infrastructure.po.RuleTreePO; import org.apache.ibatis.annotations.Mapper; /** @@ -17,13 +17,13 @@ public interface RuleTreeDao { * @param id ID * @return 规则树 */ - RuleTreeVO queryRuleTreeByTreeId(Long id); + RuleTreePO queryRuleTreeByTreeId(Long id); /** * 规则树简要信息查询 * @param treeId 规则树ID * @return 规则树 */ - RuleTreeVO queryTreeSummaryInfo(Long treeId); + RuleTreePO queryTreeSummaryInfo(Long treeId); } diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeDao.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeDao.java index 8e62a4e..624db48 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeDao.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeDao.java @@ -1,5 +1,5 @@ package cn.bugstack.xfg.frame.infrastructure.dao; -import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodeVO; +import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodePO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -19,7 +19,7 @@ public interface RuleTreeNodeDao { * @param treeId 规则树ID * @return 规则树节点集合 */ - List queryRuleTreeNodeList(Long treeId); + List queryRuleTreeNodeList(Long treeId); /** * 查询规则树节点数量 @@ -34,6 +34,6 @@ public interface RuleTreeNodeDao { * @param treeId 规则树ID * @return 节点集合 */ - List queryTreeRulePoint(Long treeId); + List queryTreeRulePoint(Long treeId); } diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeLineDao.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeLineDao.java index 616669c..534e7ff 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeLineDao.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/dao/RuleTreeNodeLineDao.java @@ -1,6 +1,6 @@ package cn.bugstack.xfg.frame.infrastructure.dao; -import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodeLineVO; +import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodeLinePO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -20,7 +20,7 @@ public interface RuleTreeNodeLineDao { * @param req 入参 * @return 规则树节点连线集合 */ - List queryRuleTreeNodeLineList(RuleTreeNodeLineVO req); + List queryRuleTreeNodeLineList(RuleTreeNodeLinePO req); /** * 查询规则树连线数量 diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeLineVO.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeLinePO.java similarity index 95% rename from xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeLineVO.java rename to xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeLinePO.java index bfcf0e6..0757e26 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeLineVO.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeLinePO.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class RuleTreeNodeLineVO { +public class RuleTreeNodeLinePO { /** 主键ID */ private Long id; diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeVO.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodePO.java similarity index 96% rename from xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeVO.java rename to xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodePO.java index c1b20b8..c4e6c58 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodeVO.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeNodePO.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class RuleTreeNodeVO { +public class RuleTreeNodePO { /** 主键ID */ private Long id; diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeVO.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreePO.java similarity index 96% rename from xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeVO.java rename to xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreePO.java index 14625bd..d36257c 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreeVO.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/po/RuleTreePO.java @@ -16,7 +16,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class RuleTreeVO { +public class RuleTreePO { /** 主键ID */ private Long id; diff --git a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/repository/RuleRepository.java b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/repository/RuleRepository.java index 57b82fa..80a67d3 100644 --- a/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/repository/RuleRepository.java +++ b/xfg-frame-infrastructure/src/main/java/cn/bugstack/xfg/frame/infrastructure/repository/RuleRepository.java @@ -8,9 +8,9 @@ import cn.bugstack.xfg.frame.domain.rule.repository.IRuleRepository; import cn.bugstack.xfg.frame.infrastructure.dao.RuleTreeDao; import cn.bugstack.xfg.frame.infrastructure.dao.RuleTreeNodeDao; import cn.bugstack.xfg.frame.infrastructure.dao.RuleTreeNodeLineDao; -import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodeLineVO; -import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodeVO; -import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeVO; +import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodeLinePO; +import cn.bugstack.xfg.frame.infrastructure.po.RuleTreeNodePO; +import cn.bugstack.xfg.frame.infrastructure.po.RuleTreePO; import cn.bugstack.xfg.frame.types.Constants; import org.springframework.stereotype.Repository; @@ -41,7 +41,7 @@ public class RuleRepository implements IRuleRepository { public TreeRuleAggregate queryTreeRuleRich(Long treeId) { // 规则树 - RuleTreeVO ruleTree = ruleTreeDao.queryRuleTreeByTreeId(treeId); + RuleTreePO ruleTree = ruleTreeDao.queryRuleTreeByTreeId(treeId); TreeRootVO treeRoot = new TreeRootVO(); treeRoot.setTreeId(ruleTree.getId()); treeRoot.setTreeRootNodeId(ruleTree.getTreeRootNodeId()); @@ -49,17 +49,17 @@ public class RuleRepository implements IRuleRepository { // 树节点->树连接线 Map treeNodeMap = new HashMap<>(); - List ruleTreeNodeList = ruleTreeNodeDao.queryRuleTreeNodeList(treeId); - for (RuleTreeNodeVO treeNode : ruleTreeNodeList) { + List ruleTreeNodeList = ruleTreeNodeDao.queryRuleTreeNodeList(treeId); + for (RuleTreeNodePO treeNode : ruleTreeNodeList) { List treeNodeLineInfoList = new ArrayList<>(); if (Constants.NodeType.STEM.equals(treeNode.getNodeType())) { - RuleTreeNodeLineVO ruleTreeNodeLineReq = new RuleTreeNodeLineVO(); + RuleTreeNodeLinePO ruleTreeNodeLineReq = new RuleTreeNodeLinePO(); ruleTreeNodeLineReq.setTreeId(treeId); ruleTreeNodeLineReq.setNodeIdFrom(treeNode.getId()); - List ruleTreeNodeLineList = ruleTreeNodeLineDao.queryRuleTreeNodeLineList(ruleTreeNodeLineReq); + List ruleTreeNodeLineList = ruleTreeNodeLineDao.queryRuleTreeNodeLineList(ruleTreeNodeLineReq); - for (RuleTreeNodeLineVO nodeLine : ruleTreeNodeLineList) { + for (RuleTreeNodeLinePO nodeLine : ruleTreeNodeLineList) { TreeNodeLineVO treeNodeLineInfo = new TreeNodeLineVO(); treeNodeLineInfo.setNodeIdFrom(nodeLine.getNodeIdFrom()); treeNodeLineInfo.setNodeIdTo(nodeLine.getNodeIdTo()); -- GitLab