From 9818f55eca2e5517f96984f30b13cc2a1a226bfc Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 25 Nov 2021 18:06:42 +0800
Subject: [PATCH] =?UTF-8?q?vpps=E6=87=92=E5=8A=A0=E8=BD=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarVppsTreeController.java        |  8 ++++----
 .../da/slrs/sarVppsTree/entity/SarVppsTree.java  | 11 ++++++++++-
 .../service/impl/SarVppsTreeServiceImpl.java     | 16 +++++++++++-----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java
index ccd79b39..6865fbd8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/controller/SarVppsTreeController.java
@@ -40,10 +40,10 @@ public class SarVppsTreeController extends BaseController<SarVppsTree> {
 
     @ApiOperation("根据父ID查询子所有资源")
     @GetMapping("/childByList")
-    public ResponseMessage<List<SarVppsTree>> childByList(String ids){
-        SarVppsTree tree = new SarVppsTree();
-        tree.setId(ids);
-        List<SarVppsTree> tsResources = iSarVppsTreeService.recursionGetChildren(tree);
+    public ResponseMessage<List<SarVppsTree>> childByList(SarVppsTree parent){
+//        SarVppsTree tree = new SarVppsTree();
+//        tree.setId(ids);
+        List<SarVppsTree> tsResources = iSarVppsTreeService.recursionGetChildren(parent);
         return Result.success(tsResources);
     }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java
index e9fb22cf..a05e6b92 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/entity/SarVppsTree.java
@@ -13,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author super_liu
@@ -66,6 +66,15 @@ public class SarVppsTree extends BaseEntity {
     @TableField(exist = false)
     private String parentIdsName;
 
+    @ApiModelProperty("层级")
+    @TableField("LEVEL")
+    private Integer level;
+
+    @ApiModelProperty("类型")
+    @TableField("TYPE")
+    private String type;
+
+
     @TableField(exist=false)
     private List<String> roleIds;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
index 32c8c76d..7f9f4028 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
@@ -27,8 +27,11 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
     @Override
     public List<SarVppsTree> getAll(SarVppsTree sarVppsTree) {
         QueryWrapper<SarVppsTree> tsResourceQueryWrapper=new QueryWrapper<>();
-        tsResourceQueryWrapper.isNull("PID");
+        tsResourceQueryWrapper.eq("TYPE",sarVppsTree.getType())
+                .eq("LEVEL",0);
         List<SarVppsTree> list = this.baseMapper.selectList(tsResourceQueryWrapper);
+
+        list.forEach(item->item.setVppsCode("10"));
 //        for(SarVppsTree tree:list){
 //            tree.setChildren(recursionGetChildren((tree)));
 //        }
@@ -44,11 +47,14 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
     public List<SarVppsTree> recursionGetChildren(SarVppsTree parent){
         QueryWrapper<SarVppsTree> sarMenuQueryWrapper=new QueryWrapper<>();
         sarMenuQueryWrapper.orderByAsc("SORT");
-        sarMenuQueryWrapper.in("PID",parent.getId());
+//        sarMenuQueryWrapper.in("PID",parent.getId());
+        sarMenuQueryWrapper.eq("LEVEL", parent.getLevel()+1)
+                .eq("TYPE",parent.getType())
+                .like("VPPS_CODE",parent.getVppsCode());
         List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
-        for(SarVppsTree sarMenu:children){
-            sarMenu.setChildren(recursionGetChildren((sarMenu)));
-        }
+//        for(SarVppsTree sarMenu:children){
+//            sarMenu.setChildren(recursionGetChildren((sarMenu)));
+//        }
         return children;
     }
 }