Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!403

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java

@@ -103,4 +103,8 @@ public class TsResource extends BaseEntity {
     @TableField(exist = false)
     private String isFlow;
 
+    @ApiModelProperty(value = "树结构数据 区分 类型： 标准数据 tsr 技术系列 sarMs")
+    @TableField(exist = false)
+    private String treeType;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -220,6 +220,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
         TsResources=dao.selectList(queryWrapper);
 
         for(TsResource resource:TsResources){
+            resource.setTreeType("tsr");
             QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
@@ -343,6 +344,7 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
         if(!tsResources.isEmpty()){
             tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
             tsResources.forEach(resource1 -> {
+                resource1.setTreeType("tsr");
                 resource1.setChildren(recursionGetListChildrenStand((resource1),(children)));
             });
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java

@@ -66,6 +66,9 @@ public class SarStandardsInfoEOPage extends BasePage {
     private List<String> menuRoleList; //有权限的目录
     private String[] idlist;  //多个id
     private String menuId; //目录ID
+    private String treeType; // 树结构数据 区分 类型： 标准数据 tsr 技术系列 sarMs
+    private String sarMsType; // 树结构数据 技术系列 sarMs 过滤此目录之外数据
+    private String sarMsMenuId;
     private String rootMenuId;
     private String attrSearchStr;
     private String advanceSearchStr;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -221,6 +221,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     @Autowired
     private ITsResourceService iTsResourceService;
 
+    @Autowired
+    private ISarMenuStandardService iSarMenuStandardService;
+
     @Autowired
     private CreateStandMQService createStandMQService;
 
@@ -299,21 +302,44 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
         if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
-            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            String treeType = page.getTreeType();
+            QueryWrapper qw = new QueryWrapper<>();
             qw.eq("ID",page.getMenuId());
             qw.isNull("PARENT_ID");
             List<TsResource> children = iTsResourceService.list(qw);
-            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "tsr".equals(treeType)){
-                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+//                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
-                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+//                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
-                    page.setMenuRoleList(getMenuIdList);
+//                    page.setMenuRoleList(getMenuIdList);
-                } else {
+//                } else {
-                    page.setMenuRoleList(null);
+//                    page.setMenuRoleList(null);
-                }
+//                }
                 List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
                 if (ids != null && !ids.isEmpty()) {
                     page.setMenuAllChildrenIdList(ids);
                 }
+            }else if(!page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)){
+//                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+//                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+//                    page.setMenuRoleList(getMenuIdList);
+//                } else {
+//                    page.setMenuRoleList(null);
+//                }
+                List<String> ids = iSarMenuStandardService.getChildMenuList(page.getMenuId());
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
+            }else if(page.getMenuId().equals("nomenu") && StringUtils.isNotBlank(page.getSarMsType()) && "filterSarMsMenu".equals(page.getSarMsType())){
+//                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+//                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+//                    page.setMenuRoleList(getMenuIdList);
+//                } else {
+//                    page.setMenuRoleList(null);
+//                }
+                List<String> ids = iSarMenuStandardService.getChildMenuList(page.getSarMsMenuId());
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
             }
         }
         Integer rowCount = dao.getSarStandardsInfoCount(page);

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -1030,6 +1030,14 @@
                     #{item}
                 </foreach>
 
+            </if>
+
+            <if test="page.menuId != null and page.menuId =='nomenu' and page.sarMsType != null and page.sarMsType == 'filterSarMsMenu' and page.menuAllChildrenIdList != null">
+                and SAR_STAND_MENU.MENU_ID not in
+                <foreach collection="page.menuAllChildrenIdList" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
             </if>
             <!--  新修改需求，根据角色查询有权限的菜单数据-->
             <if test="page.menuRoleList != null">

adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java

@@ -1,6 +1,7 @@
 package com.adc.da.sys.sarMenuStandard.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.sys.utils.treetool.annotation.TreeNodeId;
 import com.adc.da.sys.utils.treetool.annotation.TreeNodeName;
 import com.adc.da.sys.utils.treetool.annotation.TreeNodeParentId;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -35,6 +36,7 @@ public class  SarMenuStandard extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
+    @TreeNodeId
     @NotNull(message = "id不能为空",groups = {update.class})
     @ApiModelProperty(value = "主键")
     @TableId(value = "ID",type = IdType.UUID)
@@ -101,5 +103,8 @@ public class  SarMenuStandard extends BaseEntity {
     @TableField(exist=false)
     private String parentIdsName;
 
+    @ApiModelProperty(value = "树结构数据 区分 类型： 标准数据 tsr 技术系列 sarMs")
+    @TableField(exist = false)
+    private String treeType;
 
 }

adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface ISarMenuStandardService extends IService<SarMenuStandard> {
 
+    List<String> getChildMenuList(String menuId);
+
     /**
      * 查询所有菜单
      */

adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java

@@ -5,6 +5,8 @@ import com.adc.da.http.Result;
 import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao;
 import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
 import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
+import com.adc.da.sys.util.treetool.Tree;
+import com.adc.da.sys.util.treetool.TreeNode;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +38,22 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
         return dao.selectById(id);
     }
 
+    public List<String> getChildMenuList (String menuId) {
+        List<String> menuIds = new ArrayList<>();
+        if (StringUtils.isNotEmpty(menuId)) {
+            List<SarMenuStandard> SarMenuList = dao.selectList(new QueryWrapper<>());
+            Tree tree = new Tree(SarMenuList);
+            TreeNode treeNode = tree.getTreeNode(menuId);
+            if (treeNode != null) {
+                menuIds.add(treeNode.getNodeId());
+                for (TreeNode node : treeNode.getAllChildren()) {
+                    menuIds.add(node.getNodeId());
+                }
+            }
+        }
+        return menuIds;
+    }
+
     /**
      * 查询有权限菜单
      * @param sarMenuStandard
@@ -57,6 +75,7 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
         TsResources=dao.selectList(queryWrapper);
 
         for(SarMenuStandard resource:TsResources){
+            resource.setTreeType("sarMs");
             QueryWrapper<SarMenuStandard> TsResourceQueryWrapper=new QueryWrapper<>();
             TsResourceQueryWrapper.like("PARENT_IDS",resource.getId());
             TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
@@ -78,6 +97,7 @@ public class SarMenuStandardServiceImpl extends ServiceImpl<SarMenuStandardDao,
         if(!tsResources.isEmpty()){
             tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
             tsResources.forEach(resource1 -> {
+                resource1.setTreeType("sarMs");
                 resource1.setChildren(recursionGetListChildrenStand((resource1),(children)));
             });
         }

adc-da-sys/src/main/java/com/adc/da/sys/util/tree/ITree.java

@@ -0,0 +1,32 @@
+package com.adc.da.sys.util.tree;
+
+import java.util.List;
+
+/**
+ * 操作树的接口类
+ *
+ */
+public interface ITree {
+    /**
+     * 获取构建数的list，因为根节点可能不止一个，所有返回List
+     * 获取的结构与getRoot基本一致，但是后边增加了另外的数据，不建议调用
+     *
+     * @return
+     */
+    List<TreeNode> getTree();
+
+    /**
+     * 获取根节点树结构，因为根节点可能不止一个，所有返回List
+     *
+     * @return
+     */
+    List<TreeNode> getRoot();
+
+    /**
+     * 获取指定节点数据
+     *
+     * @param nodeId
+     * @return
+     */
+    TreeNode getTreeNode(String nodeId);
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/tree/ITreeNode.java

@@ -0,0 +1,43 @@
+package com.adc.da.sys.util.tree;
+
+/**
+ * 需要实现树的实体类需要实现的接口，获取关键数据
+ *
+ */
+public interface ITreeNode<T> {
+    /**
+     * TreeNode获取nodeId
+     *
+     * @return
+     */
+    String getNodeId();
+
+    /**
+     * TreeNode获取nodeName
+     *
+     * @return
+     */
+    String getNodeName();
+
+    /**
+     * TreeNode获取nodeParentId（父id）
+     *
+     * @return
+     */
+    String getNodeParentId();
+
+    /**
+     * TreeNode获取orderNum(排序字段用于排序)
+     *
+     * @return
+     */
+    Integer getOrderNum();
+
+    /**
+     * TreeNode获取nodeLevel(当前属于第几层级)
+     *
+     * @return
+     */
+    Integer getNodeLevel();
+
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/tree/Tree.java

@@ -0,0 +1,133 @@
+package com.adc.da.sys.util.tree;
+
+import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+
+/**
+ * 构建树形建构
+ */
+public class Tree implements ITree {
+    /**
+     * 用于存放treeNode的Map
+     */
+    private LinkedHashMap<String, TreeNode> treeNodesMap = new LinkedHashMap<>();
+    /**
+     * 用于存放treeNode的list
+     */
+    private List<TreeNode> treeNodesList = new ArrayList<>();
+
+    /**
+     * 构造方法
+     *
+     * @param list
+     */
+    public Tree(List<ITreeNode> list) {
+        initTreeNodeMap(list);
+        initTreeNodeList();
+    }
+
+    /**
+     * 将List对象数据转为TreeNodeMap
+     *
+     * @param list
+     */
+    private void initTreeNodeMap(List<ITreeNode> list) {
+        TreeNode treeNode;
+        for (ITreeNode item : list) {
+            treeNode = new TreeNode(item);
+            treeNode.setLastNodeNum(1);
+            treeNodesMap.put(treeNode.getNodeId(), treeNode);
+        }
+        Iterator<TreeNode> iterator = treeNodesMap.values().iterator();
+        TreeNode parentTreeNode;
+        while (iterator.hasNext()) {
+            treeNode = iterator.next();
+            if (StringUtils.isEmpty(treeNode.getParentNodeId())) {
+                continue;
+            }
+            parentTreeNode = treeNodesMap.get(treeNode.getParentNodeId());
+            if (parentTreeNode != null) {
+                treeNode.setParent(parentTreeNode);
+                parentTreeNode.addChild(treeNode);
+                // 按照orderNum排序
+                Collections.sort(parentTreeNode.getChildren(), new OrdNamComparator());
+                // 判断这个节点是否是最子节点
+                if (treeNode.getChildren().size() == 0) {
+                    treeNode.setLastNode(true);
+                }
+                // 计算每一个节点的最子节点的数量
+                List<TreeNode> children = parentTreeNode.getChildren();
+                if (children.size() > 0) {
+                    int sum = 0;
+                    for (TreeNode treeNode2 : children) {
+                        sum += treeNode2.getLastNodeNum();
+                    }
+                    parentTreeNode.setLastNodeNum(sum);
+                }
+            }
+        }
+    }
+
+    /**
+     * 根据treeNodesMap转为treeNodesList
+     */
+    private void initTreeNodeList() {
+        if (treeNodesList.size() > 0) {
+            return;
+        }
+        if (treeNodesMap.size() == 0) {
+            return;
+        }
+        Iterator<TreeNode> iterator = treeNodesMap.values().iterator();
+        TreeNode treeNode;
+        while (iterator.hasNext()) {
+            treeNode = iterator.next();
+            if (treeNode.getParent() == null) {
+                this.treeNodesList.add(treeNode);
+                this.treeNodesList.addAll(treeNode.getAllChildren());
+            }
+        }
+    }
+
+    @Override
+    public List<TreeNode> getTree() {
+        return this.treeNodesList;
+    }
+
+    @Override
+    public List<TreeNode> getRoot() {
+        List<TreeNode> rootList = new ArrayList<>();
+        if (this.treeNodesList.size() > 0) {
+            for (TreeNode node : treeNodesList) {
+                if (node.getParent() == null) {
+                    rootList.add(node);
+                    Collections.sort(rootList, new OrdNamComparator());
+                }
+            }
+        }
+        return rootList;
+    }
+
+    @Override
+    public TreeNode getTreeNode(String nodeId) {
+        return this.treeNodesMap.get(nodeId);
+    }
+}
+
+/**
+ * 自定义排序，按照orderNum排序
+ */
+class OrdNamComparator implements Comparator<TreeNode> {
+    @Override
+    public int compare(TreeNode t1, TreeNode t2) {
+        if (t1.getOrderNum() > t2.getOrderNum()) {
+            return 1;
+        }
+        if (t1.getOrderNum() < t2.getOrderNum()) {
+            return -1;
+        }
+        return t1.getNodeName().compareTo(t2.getNodeName());
+    }
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/tree/TreeNode.java

@@ -0,0 +1,187 @@
+package com.adc.da.sys.util.tree;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TreeNode {
+
+    /**
+     * 树节点ID
+     */
+    @JSONField(ordinal = 1)
+    private String nodeId;
+    /**
+     * 树节点名称
+     */
+    @JSONField(ordinal = 2)
+    private String nodeName;
+    /**
+     * 父节点ID
+     */
+    @JSONField(ordinal = 3)
+    private String parentNodeId;
+    /**
+     * 节点在树中的排序号
+     */
+    @JSONField(ordinal = 4)
+    private int orderNum;
+    /**
+     * 节点所在的层级
+     */
+    @JSONField(ordinal = 5)
+    private int level;
+    /**
+     * 最子节点的数量
+     */
+    @JSONField(ordinal = 6)
+    private int lastNodeNum;
+
+    /**
+     * 是否是最子节点
+     */
+    @JSONField(ordinal = 7)
+    private boolean lastNode;
+
+    /**
+     * 当前节点的儿子节点
+     */
+    @JSONField(ordinal = 8)
+    private List<TreeNode> children = new ArrayList<>();
+
+    /**
+     * 当前节点的完整路径
+     */
+    @JSONField(ordinal = 9)
+    private String completeName;
+
+    /**
+     * 当前节点的父级节点
+     * 转json的时候忽略此属性，因为此属性到前端无作用
+     */
+    @JSONField(serialize = false)
+    private TreeNode parent;
+
+    /**
+     * 当前节点的子孙节点
+     * 转json的时候忽略此属性，因为此属性到前端无作用
+     */
+    @JSONField(serialize = false)
+    private List<TreeNode> allChildren = new ArrayList<>();
+
+    public TreeNode(ITreeNode obj) {
+        this.nodeId = obj.getNodeId();
+        this.nodeName = obj.getNodeName();
+        this.parentNodeId = obj.getNodeParentId();
+        this.orderNum = obj.getOrderNum();
+        this.level = obj.getNodeLevel();
+    }
+
+    public TreeNode(TreeNode obj) {
+        this.orderNum = obj.getOrderNum();
+        this.level = obj.getLevel();
+        this.lastNodeNum = obj.getLastNodeNum();
+    }
+
+    public TreeNode() {
+    }
+
+    public void addChild(TreeNode treeNode) {
+        this.children.add(treeNode);
+    }
+
+    public void removeChild(TreeNode treeNode) {
+        this.children.remove(treeNode);
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
+
+    public String getParentNodeId() {
+        return parentNodeId;
+    }
+
+    public void setParentNodeId(String parentNodeId) {
+        this.parentNodeId = parentNodeId;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public TreeNode getParent() {
+        return parent;
+    }
+
+    public void setParent(TreeNode parent) {
+        this.parent = parent;
+    }
+
+    public List<TreeNode> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<TreeNode> children) {
+        this.children = children;
+    }
+
+    public int getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(int orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    public int getLastNodeNum() {
+        return lastNodeNum;
+    }
+
+    public void setLastNodeNum(int lastNodeNum) {
+        this.lastNodeNum = lastNodeNum;
+    }
+
+    public boolean isLastNode() {
+        return lastNode;
+    }
+
+    public void setLastNode(boolean lastNode) {
+        this.lastNode = lastNode;
+    }
+
+    public List<TreeNode> getAllChildren() {
+        if (this.allChildren.isEmpty()) {
+            for (TreeNode treeNode : this.children) {
+                this.allChildren.add(treeNode);
+                this.allChildren.addAll(treeNode.getAllChildren());
+            }
+        }
+        return this.allChildren;
+    }
+
+    public String getCompleteName() {
+        return completeName;
+    }
+
+    public void setCompleteName(String completeName) {
+        this.completeName = completeName;
+    }
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/OrdNamComparator.java

@@ -0,0 +1,21 @@
+package com.adc.da.sys.util.treetool;
+
+import java.util.Comparator;
+
+/**
+ * List 排序 Comparator
+ * @author david
+ */
+public class OrdNamComparator implements Comparator<TreeNode> {
+
+    @Override
+    public int compare(TreeNode t1, TreeNode t2) {
+        if (t1.getOrderNum() > t2.getOrderNum()) {
+            return 1;
+        }
+        if (t1.getOrderNum() < t2.getOrderNum()) {
+            return -1;
+        }
+        return t1.getNodeName().compareTo(t2.getNodeName());
+    }
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/Tree.java

@@ -0,0 +1,179 @@
+package com.adc.da.sys.util.treetool;
+
+import com.adc.da.sys.utils.treetool.annotation.*;
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+//import group.ipp.tree.util.annotation.TreeNodeLevel;
+//import group.ipp.tree.util.annotation.TreeNodeName;
+//import group.ipp.tree.util.annotation.TreeNodeOrder;
+//import group.ipp.tree.util.annotation.TreeNodeParentId;
+
+/**
+ * 构建树形建构
+ *
+ * @author David
+ */
+public class Tree<T> {
+    /**
+     * 用于存放treeNode的Map
+     */
+    private LinkedHashMap<String, TreeNode> treeNodesMap = new LinkedHashMap<>();
+    /**
+     * 用于存放treeNode的list
+     */
+    private List<TreeNode> treeNodesList = new ArrayList<>();
+
+    /**
+     * 构造方法
+     *
+     * @param list
+     */
+    public Tree(List<T> list) {
+        initTreeNodeMap(list);
+        initTreeNodeList();
+    }
+
+    /**
+     * 将List对象数据转为TreeNodeMap
+     *
+     * @param list
+     */
+    private void initTreeNodeMap(List<T> list) {
+        TreeNode treeNode;
+        for (Object item : list) {
+            treeNode = new TreeNode();
+            treeNode.setNodeId(getFieldValue(item, "TreeNodeId"));
+            treeNode.setNodeName(getFieldValue(item, "TreeNodeName"));
+            treeNode.setParentNodeId(getFieldValue(item, "TreeNodeParentId"));
+            if(StringUtils.isEmpty(getFieldValue(item, "TreeNodeLevel"))) {
+                treeNode.setLevel(0);
+            } else {
+                treeNode.setLevel(Integer.parseInt(getFieldValue(item, "TreeNodeLevel")));
+            }
+            if(StringUtils.isEmpty(getFieldValue(item, "TreeNodeOrder"))) {
+                treeNode.setOrderNum(0);
+            } else {
+                treeNode.setOrderNum(Integer.parseInt(getFieldValue(item, "TreeNodeOrder")));
+            }
+            treeNode.setLastNodeNum(1);
+            treeNode.setData(item);
+            treeNodesMap.put(treeNode.getNodeId(), treeNode);
+        }
+        Iterator<TreeNode> iterator = treeNodesMap.values().iterator();
+        TreeNode parentTreeNode;
+        while (iterator.hasNext()) {
+            treeNode = iterator.next();
+            if (StringUtils.isEmpty(treeNode.getParentNodeId())) {
+                continue;
+            }
+            parentTreeNode = treeNodesMap.get(treeNode.getParentNodeId());
+            if (parentTreeNode != null) {
+                treeNode.setParent(parentTreeNode);
+                parentTreeNode.addChild(treeNode);
+                // 按照orderNum排序
+                Collections.sort(parentTreeNode.getChildren(), new OrdNamComparator());
+                // 判断这个节点是否是最子节点
+                if (treeNode.getChildren().size() == 0) {
+                    treeNode.setLastNode(true);
+                }
+                // 计算每一个节点的最子节点的数量
+                List<TreeNode> children = parentTreeNode.getChildren();
+                if (children.size() > 0) {
+                    int sum = 0;
+                    for (TreeNode treeNode2 : children) {
+                        sum += treeNode2.getLastNodeNum();
+                    }
+                    parentTreeNode.setLastNodeNum(sum);
+                }
+            }
+        }
+    }
+
+    private String getFieldValue(Object obj, String type) {
+        Class clz = obj.getClass();
+        Field[] fields = clz.getDeclaredFields();
+        String value = null;
+        try {
+            for(Field field : fields){
+                field.setAccessible(true);
+                switch (type){
+                    case "TreeNodeId":
+                        if(field.isAnnotationPresent(TreeNodeId.class)) {
+                            value = String.valueOf(field.get(obj));
+                        }
+                        break;
+                    case "TreeNodeParentId":
+                        if(field.isAnnotationPresent(TreeNodeParentId.class)) {
+                            value = String.valueOf(field.get(obj));
+                        }
+                        break;
+                    case "TreeNodeName":
+                        if(field.isAnnotationPresent(TreeNodeName.class)) {
+                            value = String.valueOf(field.get(obj));
+                        }
+                        break;
+                    case "TreeNodeOrder":
+                        if(field.isAnnotationPresent(TreeNodeOrder.class)) {
+                            value = String.valueOf(field.get(obj));
+                        }
+                        break;
+                    case "TreeNodeLevel":
+                        if(field.isAnnotationPresent(TreeNodeLevel.class)) {
+                            value = String.valueOf(field.get(obj));
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        } catch (IllegalAccessException e) {
+                e.printStackTrace();
+        }
+        return value;
+    }
+
+    /**
+     * 根据treeNodesMap转为treeNodesList
+     */
+    private void initTreeNodeList() {
+        if (treeNodesList.size() > 0) {
+            return;
+        }
+        if (treeNodesMap.size() == 0) {
+            return;
+        }
+        Iterator<TreeNode> iterator = treeNodesMap.values().iterator();
+        TreeNode treeNode;
+        while (iterator.hasNext()) {
+            treeNode = iterator.next();
+            if (treeNode.getParent() == null) {
+                this.treeNodesList.add(treeNode);
+                this.treeNodesList.addAll(treeNode.getAllChildren());
+            }
+        }
+    }
+
+    public List<TreeNode> getTree() {
+        return this.treeNodesList;
+    }
+
+    public List<TreeNode> getRoot() {
+        List<TreeNode> rootList = new ArrayList<>();
+        if (this.treeNodesList.size() > 0) {
+            for (TreeNode node : treeNodesList) {
+                if (node.getParent() == null) {
+                    rootList.add(node);
+                    Collections.sort(rootList, new OrdNamComparator());
+                }
+            }
+        }
+        return rootList;
+    }
+
+    public TreeNode getTreeNode(String nodeId) {
+        return this.treeNodesMap.get(nodeId);
+    }
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/TreeNode.java

@@ -0,0 +1,202 @@
+package com.adc.da.sys.util.treetool;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author David
+ */
+public class TreeNode {
+
+    /**
+     * 树节点ID
+     */
+    @JSONField(ordinal = 1)
+    private String nodeId;
+    /**
+     * 树节点名称
+     */
+    @JSONField(ordinal = 2)
+    private String nodeName;
+    /**
+     * 父节点ID
+     */
+    @JSONField(ordinal = 3)
+    private String parentNodeId;
+    /**
+     * 节点在树中的排序号
+     */
+    @JSONField(ordinal = 4)
+    private int orderNum;
+    /**
+     * 节点所在的层级
+     */
+    @JSONField(ordinal = 5)
+    private int level;
+    /**
+     * 最子节点的数量
+     */
+    @JSONField(ordinal = 6)
+    private int lastNodeNum;
+
+    /**
+     * 是否是最子节点
+     */
+    @JSONField(ordinal = 7)
+    private boolean lastNode;
+
+    private Object data;
+
+    /**
+     * 当前节点的儿子节点
+     */
+    @JSONField(ordinal = 8)
+    private List<TreeNode> children = new ArrayList<>();
+
+    /**
+     * 当前节点的完整路径
+     */
+    @JSONField(ordinal = 9)
+    private String completeName;
+
+    /**
+     * 当前节点的父级节点
+     * 转json的时候忽略此属性，因为此属性到前端无作用
+     */
+    @JSONField(serialize = false)
+    private TreeNode parent;
+
+    /**
+     * 当前节点的子孙节点
+     * 转json的时候忽略此属性，因为此属性到前端无作用
+     */
+    @JSONField(serialize = false)
+    private List<TreeNode> allChildren = new ArrayList<>();
+
+    private int standFlag;
+
+    public TreeNode(TreeNode obj) {
+        this.orderNum = obj.getOrderNum();
+        this.level = obj.getLevel();
+        this.lastNodeNum = obj.getLastNodeNum();
+    }
+
+    public TreeNode() {
+    }
+
+    public void addChild(TreeNode treeNode) {
+        this.children.add(treeNode);
+    }
+
+    public void removeChild(TreeNode treeNode) {
+        this.children.remove(treeNode);
+    }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
+
+    public String getParentNodeId() {
+        return parentNodeId;
+    }
+
+    public void setParentNodeId(String parentNodeId) {
+        this.parentNodeId = parentNodeId;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public TreeNode getParent() {
+        return parent;
+    }
+
+    public void setParent(TreeNode parent) {
+        this.parent = parent;
+    }
+
+    public List<TreeNode> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<TreeNode> children) {
+        this.children = children;
+    }
+
+    public int getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(int orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    public int getLastNodeNum() {
+        return lastNodeNum;
+    }
+
+    public void setLastNodeNum(int lastNodeNum) {
+        this.lastNodeNum = lastNodeNum;
+    }
+
+    public boolean isLastNode() {
+        return lastNode;
+    }
+
+    public void setLastNode(boolean lastNode) {
+        this.lastNode = lastNode;
+    }
+
+    public List<TreeNode> getAllChildren() {
+        if (this.allChildren.isEmpty()) {
+            for (TreeNode treeNode : this.children) {
+                this.allChildren.add(treeNode);
+                this.allChildren.addAll(treeNode.getAllChildren());
+            }
+        }
+        return this.allChildren;
+    }
+
+    public String getCompleteName() {
+        return completeName;
+    }
+
+    public void setCompleteName(String completeName) {
+        this.completeName = completeName;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    public int getStandFlag() {
+        return standFlag;
+    }
+
+    public void setStandFlag(int standFlag) {
+        this.standFlag = standFlag;
+    }
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/annotation/TreeNodeId.java

@@ -0,0 +1,12 @@
+package com.adc.da.sys.util.treetool.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author david
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface TreeNodeId {
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/annotation/TreeNodeLevel.java

@@ -0,0 +1,12 @@
+package com.adc.da.sys.util.treetool.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author david
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface TreeNodeLevel {
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/annotation/TreeNodeName.java

@@ -0,0 +1,12 @@
+package com.adc.da.sys.util.treetool.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author david
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface TreeNodeName {
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/annotation/TreeNodeOrder.java

@@ -0,0 +1,12 @@
+package com.adc.da.sys.util.treetool.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author david
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface TreeNodeOrder {
+}

adc-da-sys/src/main/java/com/adc/da/sys/util/treetool/annotation/TreeNodeParentId.java

@@ -0,0 +1,12 @@
+package com.adc.da.sys.util.treetool.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @author david
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+@Documented
+public @interface TreeNodeParentId {
+}