1.我的文件文件夹或共享空间列表接口

src/main/java/cn/timer/api/controller/disk/sevice/DiskCatalogueService.java

@@ -14,7 +14,7 @@ public interface DiskCatalogueService {
     /**
     /**
      * 文件文件夹或共享空间列表
      * 文件文件夹或共享空间列表
      * @param orgId
      * @param orgId
-     * @param UserId
+     * @param userId
      * @param type
      * @param type
      * @return
      * @return
      */
      */

src/main/java/cn/timer/api/controller/disk/sevice/DiskCatalogueServiceImpl.java

 package cn.timer.api.controller.disk.sevice;
 package cn.timer.api.controller.disk.sevice;
 
 
 import cn.timer.api.bean.disk.DiskCatalogue;
 import cn.timer.api.bean.disk.DiskCatalogue;
+import cn.timer.api.bean.disk.DiskCatalogueFiles;
+import cn.timer.api.bean.disk.DiskFiles;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
@@ -17,8 +20,12 @@ import java.util.stream.Collectors;
  */
  */
 @Service
 @Service
 public class DiskCatalogueServiceImpl implements DiskCatalogueService {
 public class DiskCatalogueServiceImpl implements DiskCatalogueService {
-
+    //所有文件夹
     private static List<DiskCatalogue> treeList = new ArrayList<>();
     private static List<DiskCatalogue> treeList = new ArrayList<>();
+    //所有文件
+    private static List<DiskFiles> filesList = new ArrayList<>();
+    //所有文件夹ID
+    private static Map<Integer, List<DiskCatalogueFiles>> map = new HashMap<Integer, List<DiskCatalogueFiles>>();
 
 
     @Override
     @Override
     public List<DiskCatalogue> getDiskCatalogueList(Integer orgId, Integer userId, Integer type) {
     public List<DiskCatalogue> getDiskCatalogueList(Integer orgId, Integer userId, Integer type) {
@@ -26,7 +33,25 @@ public class DiskCatalogueServiceImpl implements DiskCatalogueService {
                 .lambda().eq(DiskCatalogue::getOrgId, orgId)
                 .lambda().eq(DiskCatalogue::getOrgId, orgId)
                 .eq(DiskCatalogue::getCreateUserId, userId)
                 .eq(DiskCatalogue::getCreateUserId, userId)
                 .eq(DiskCatalogue::getType, type)
                 .eq(DiskCatalogue::getType, type)
+                .eq(DiskCatalogue::getDeleteFlag, 0)
         );
         );
+        if (treeList.size() == 0) {
+            return treeList;
+        }
+        filesList = DiskFiles.builder().build().selectList(new QueryWrapper<DiskFiles>()
+                .lambda().eq(DiskFiles::getCreateUserId, userId)
+                .eq(DiskFiles::getDeleteFlag, 0)
+
+        );
+
+        List<DiskCatalogueFiles> diskCatalogueFilesList = DiskCatalogueFiles.builder().build().selectList(new QueryWrapper<DiskCatalogueFiles>()
+                .lambda().in(DiskCatalogueFiles::getCatalogueId, treeList.stream().map(item -> item.getId()).collect(Collectors.toList()))
+                .eq(DiskCatalogueFiles::getDeleteFlag, 0)
+
+        );
+        //根据CatalogueId分组
+        map = diskCatalogueFilesList.stream().collect(Collectors.groupingBy(DiskCatalogueFiles::getCatalogueId));
+
         List<DiskCatalogue> list = treeList.stream().filter(s -> s.getParentId() == 0).collect(Collectors.toList());
         List<DiskCatalogue> list = treeList.stream().filter(s -> s.getParentId() == 0).collect(Collectors.toList());
 
 
         return getTree(list);
         return getTree(list);
@@ -56,6 +81,13 @@ public class DiskCatalogueServiceImpl implements DiskCatalogueService {
      */
      */
     public static DiskCatalogue recursiveTree(Integer cid) {
     public static DiskCatalogue recursiveTree(Integer cid) {
         DiskCatalogue node = getMenuById(cid);
         DiskCatalogue node = getMenuById(cid);
+        //填充文件夹下所有文件
+        List<DiskCatalogueFiles> diskCatalogueFilesList = (List<DiskCatalogueFiles>) map.get(cid);
+        if (!CollectionUtils.isEmpty(diskCatalogueFilesList)) {
+            List<Integer> ids = diskCatalogueFilesList.stream().map(item -> item.getFilesId()).collect(Collectors.toList());
+            List<DiskFiles> diskFilesList = filesList.stream().filter(item -> ids.contains(item.getId())).collect(Collectors.toList());
+            node.setDiskFilesList(diskFilesList);
+        }
         List<DiskCatalogue> childTreeNodes = getChildTreeById(cid);
         List<DiskCatalogue> childTreeNodes = getChildTreeById(cid);
         for (DiskCatalogue child : childTreeNodes) {
         for (DiskCatalogue child : childTreeNodes) {
             DiskCatalogue n = recursiveTree(child.getId());
             DiskCatalogue n = recursiveTree(child.getId());
@@ -94,7 +126,7 @@ public class DiskCatalogueServiceImpl implements DiskCatalogueService {
     }
     }
 
 
     /**
     /**
-     * 根据父节点CID获取所有了节点
+     * 根据父节点CID获取所有子节点
      */
      */
     public static List<DiskCatalogue> getChildTreeById(Integer cid) {
     public static List<DiskCatalogue> getChildTreeById(Integer cid) {
         List<DiskCatalogue> list = new ArrayList<>();
         List<DiskCatalogue> list = new ArrayList<>();