diff --git a/continew-starter-core/src/main/java/top/continew/starter/core/util/TreeBuildUtils.java b/continew-starter-core/src/main/java/top/continew/starter/core/util/TreeUtils.java similarity index 91% rename from continew-starter-core/src/main/java/top/continew/starter/core/util/TreeBuildUtils.java rename to continew-starter-core/src/main/java/top/continew/starter/core/util/TreeUtils.java index 5b285b05..6a91a9d4 100644 --- a/continew-starter-core/src/main/java/top/continew/starter/core/util/TreeBuildUtils.java +++ b/continew-starter-core/src/main/java/top/continew/starter/core/util/TreeUtils.java @@ -24,6 +24,7 @@ import cn.hutool.core.lang.tree.parser.NodeParser; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.ReflectUtil; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.function.Function; @@ -31,14 +32,18 @@ import java.util.stream.Collectors; import java.util.stream.Stream; /** - * 扩展 hutool TreeUtil 封装树构建 + * 树工具类 * - * @author Lion Li + *

+ * 扩展 Hutool TreeUtil 封装树构建 + *

+ * + * @author Lion Li(RuoYi-Vue-Plus) * @author lishuyan */ -public class TreeBuildUtils extends TreeUtil { +public class TreeUtils extends TreeUtil { - private TreeBuildUtils() { + private TreeUtils() { } /** @@ -52,7 +57,7 @@ public class TreeBuildUtils extends TreeUtil { */ public static List> build(List list, NodeParser nodeParser) { if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); + return new ArrayList<>(0); } K k = ReflectUtil.invoke(list.get(0), CharSequenceUtil.genGetter("parentId")); return TreeUtil.build(list, k, TreeNodeConfig.DEFAULT_CONFIG, nodeParser); @@ -70,7 +75,7 @@ public class TreeBuildUtils extends TreeUtil { */ public static List> build(List list, K parentId, NodeParser nodeParser) { if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); + return new ArrayList<>(0); } return TreeUtil.build(list, parentId, TreeNodeConfig.DEFAULT_CONFIG, nodeParser); } @@ -91,7 +96,7 @@ public class TreeBuildUtils extends TreeUtil { TreeNodeConfig treeNodeConfig, NodeParser nodeParser) { if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); + return new ArrayList<>(0); } return TreeUtil.build(list, parentId, treeNodeConfig, nodeParser); } @@ -112,7 +117,7 @@ public class TreeBuildUtils extends TreeUtil { Function getParentId, NodeParser parser) { if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); + return new ArrayList<>(0); } Set rootParentIds = CollUtils.mapToSet(list, getParentId); rootParentIds.removeAll(CollUtils.mapToSet(list, getId)); @@ -140,7 +145,7 @@ public class TreeBuildUtils extends TreeUtil { TreeNodeConfig treeNodeConfig, NodeParser parser) { if (CollUtil.isEmpty(list)) { - return CollUtil.newArrayList(); + return new ArrayList<>(0); } Set rootParentIds = CollUtils.mapToSet(list, getParentId); rootParentIds.removeAll(CollUtils.mapToSet(list, getId)); @@ -159,9 +164,9 @@ public class TreeBuildUtils extends TreeUtil { */ public static List> getLeafNodes(List> nodes) { if (CollUtil.isEmpty(nodes)) { - return CollUtil.newArrayList(); + return new ArrayList<>(0); } - return nodes.stream().flatMap(TreeBuildUtils::extractLeafNodes).collect(Collectors.toList()); + return nodes.stream().flatMap(TreeUtils::extractLeafNodes).collect(Collectors.toList()); } /** @@ -176,7 +181,7 @@ public class TreeBuildUtils extends TreeUtil { return Stream.of(node); } else { // 递归调用,获取所有子节点的叶子节点 - return node.getChildren().stream().flatMap(TreeBuildUtils::extractLeafNodes); + return node.getChildren().stream().flatMap(TreeUtils::extractLeafNodes); } } diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index 4a090af6..31110f15 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.core.util.TreeBuildUtils; +import top.continew.starter.core.util.TreeUtils; import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.base.BaseMapper; import top.continew.starter.data.service.impl.ServiceImpl; @@ -127,8 +127,8 @@ public class CrudServiceImpl, T extends BaseIdDO, L, D, Function getParentId = createMethodReference(listClass, CharSequenceUtil.genGetter(treeField .parentIdKey())); // 构建多根节点树 - return TreeBuildUtils.buildMultiRoot(list, getId, getParentId, treeNodeConfig, (node, - tree) -> buildTreeField(isSimple, node, tree, treeField)); + return TreeUtils.buildMultiRoot(list, getId, getParentId, treeNodeConfig, (node, + tree) -> buildTreeField(isSimple, node, tree, treeField)); } } diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index e699ad4d..30e27712 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -39,7 +39,7 @@ import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.exception.BusinessException; import top.continew.starter.core.util.ClassUtils; import top.continew.starter.core.util.ReflectUtils; -import top.continew.starter.core.util.TreeBuildUtils; +import top.continew.starter.core.util.TreeUtils; import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.core.util.validation.ValidationUtils; import top.continew.starter.data.mapper.BaseMapper; @@ -132,8 +132,8 @@ public class CrudServiceImpl, T extends BaseIdDO, L, D, Function getParentId = createMethodReference(listClass, CharSequenceUtil.genGetter(treeField .parentIdKey())); // 构建多根节点树 - return TreeBuildUtils.buildMultiRoot(list, getId, getParentId, treeNodeConfig, (node, - tree) -> buildTreeField(isSimple, node, tree, treeField)); + return TreeUtils.buildMultiRoot(list, getId, getParentId, treeNodeConfig, (node, + tree) -> buildTreeField(isSimple, node, tree, treeField)); } }