fix-DictCategoryController-修正tree接口获取到的子孙数据没有value的问题

ximatai · Oct 23, 2024 · 0fce735 · 0fce735
1 parent d11898e
commit 0fce735
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestDictController.java b/muyun-boot/src/test/java/net/ximatai/muyun/test/plaform/TestDictController.java
@@ -185,7 +185,7 @@ void testDictCategoryAdd() {
             .extract()
             .asString();
 
-         given()
+        List<Map> responsex = given()
             .header("userID", config.superUserId())
             .get("%s/dict/tree/%s".formatted(base, "root1"))
             .then()
@@ -194,10 +194,9 @@ void testDictCategoryAdd() {
             .as(new TypeRef<>() {
             });
 
-//        assertEquals(response.size(), 3);
-//        node = response.get(0);
-//        assertEquals(node.getChildren().size(), 1);
-//        assertNotNull(node.getValue());
+        assertEquals(responsex.size(), 3);
+        Map nodex = ((List<Map>) responsex.get(0).get("children")).get(0);
+        assertNotNull(nodex.get("value"));
 
         List<DictTreeNode> response2 = given()
             .header("userID", config.superUserId())

diff --git a/muyun-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java b/muyun-core/src/main/java/net/ximatai/muyun/ability/curd/std/IUpdateAbility.java
@@ -87,7 +87,7 @@ default Integer update(@PathParam("id") String id, Map body) {
         return result;
     }
 
-    private boolean isIdInTree(List<TreeNode> tree, String id) {
+    private boolean isIdInTree(List<? extends TreeNode> tree, String id) {
         for (TreeNode node : tree) {
             if (node.getId().equals(id)) {
                 return true;

diff --git a/muyun-core/src/main/java/net/ximatai/muyun/model/TreeNode.java b/muyun-core/src/main/java/net/ximatai/muyun/model/TreeNode.java
@@ -14,7 +14,7 @@ public class TreeNode {
     @Schema(description = "数据内容")
     private Map<String, Object> data;
     @Schema(description = "子节点")
-    private List<TreeNode> children;
+    private List<? extends TreeNode> children;
 
     public TreeNode() {
     }
@@ -31,7 +31,7 @@ public Map<String, Object> getData() {
         return data;
     }
 
-    public List<TreeNode> getChildren() {
+    public List<? extends TreeNode> getChildren() {
         return children;
     }
 
@@ -51,7 +51,7 @@ public TreeNode setData(Map<String, Object> data) {
     }
 
     public TreeNode setChildren(List<? extends TreeNode> children) {
-        this.children = (List<TreeNode>) children;
+        this.children = children;
         return this;
     }
 

diff --git a/...-platform/src/main/java/net/ximatai/muyun/platform/controller/DictCategoryController.java b/...-platform/src/main/java/net/ximatai/muyun/platform/controller/DictCategoryController.java
@@ -67,7 +67,7 @@ private List<DictTreeNode> nodeToDictNode(List<? extends TreeNode> list) {
         return list.stream().map(it -> {
             DictTreeNode node = DictTreeNode.from(it)
                 .setValue(it.getData().get("v_value").toString());
-            List<TreeNode> children = node.getChildren();
+            List<? extends TreeNode> children = node.getChildren();
             if (children != null && !children.isEmpty()) {
                 node.setChildren(nodeToDictNode(children));
             }

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RuntimeController.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/controller/RuntimeController.java
@@ -107,7 +107,7 @@ private List<TreeNode> filterMenuByAuth(List<TreeNode> list) {
         return filterMenuByAuth(list, authorizedResources);
     }
 
-    private List<TreeNode> filterMenuByAuth(List<TreeNode> list, Map<String, Set<String>> resources) {
+    private List<TreeNode> filterMenuByAuth(List<? extends TreeNode> list, Map<String, Set<String>> resources) {
         List<TreeNode> result = new ArrayList<>();
         for (TreeNode node : list) {
             Map data = node.getData();

diff --git a/muyun-platform/src/main/java/net/ximatai/muyun/platform/model/DictTreeNode.java b/muyun-platform/src/main/java/net/ximatai/muyun/platform/model/DictTreeNode.java
@@ -3,6 +3,8 @@
 import net.ximatai.muyun.model.TreeNode;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
+import java.util.List;
+
 public class DictTreeNode extends TreeNode {
     @Schema(description = "字典值")
     private String value;
@@ -23,4 +25,9 @@ public DictTreeNode setValue(String value) {
         this.value = value;
         return this;
     }
+
+    @Override
+    public List<DictTreeNode> getChildren() {
+        return (List<DictTreeNode>) super.getChildren();
+    }
 }