目录树新增某些属性

doc-biz/src/main/java/com/doc/biz/controller/DocDirController.java

@@ -1,5 +1,6 @@
 package com.doc.biz.controller;
 
+import com.alibaba.fastjson2.JSON;
 import com.doc.biz.domain.*;
 import com.doc.biz.service.*;
 import com.doc.biz.vo.MatchVO;
@@ -20,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 文档目录管理Controller
@@ -137,6 +140,8 @@ public class DocDirController extends BaseController {
      */
     private TreeVO getChildren(DocDir dir, String st) {
         TreeVO vo = new TreeVO();
+
+
         vo.setId(dir.getDirId());
         vo.setLabel(dir.getDirName());
 
@@ -165,6 +170,15 @@ public class DocDirController extends BaseController {
                     children.add(childVO);
                 }
             });
+        } else {
+            //如果是目录树，则需要返回文件数量 目录加密等级相关信息
+            Map<String, Object> remark = new HashMap<>();
+            remark.put("isEncrypt", dir.getIsEncrypt());
+            remark.put("encryptLevel", dir.getEncryptLevel());
+            remark.put("dirType", dir.getDirType());
+            Long fileNum = docInfoService.selectCountList(dir.getDirId());
+            remark.put("fileNum", fileNum);
+            vo.setRemark(JSON.toJSONString(remark));
         }
 
 

doc-biz/src/main/java/com/doc/biz/service/IDocInfoService.java

@@ -91,4 +91,12 @@ public interface IDocInfoService {
      * @return 失效文件列表
      */
     List<DocInfo> selectLoseList();
+
+    /**
+     * 根据目录ID查询文件数量
+     *
+     * @param dirId 目录ID
+     * @return 文件数量
+     */
+    Long selectCountList(Long dirId);
 }

doc-biz/src/main/java/com/doc/biz/service/impl/DocInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.doc.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.doc.biz.domain.DocFavorite;
 import com.doc.biz.domain.DocInfo;
 import com.doc.biz.domain.DocumentFile;
@@ -244,4 +245,17 @@ public class DocInfoServiceImpl implements IDocInfoService {
         });
         return result;
     }
+
+    /**
+     * 根据目录ID查询文件数量
+     *
+     * @param dirId 目录ID
+     * @return 文件数量
+     */
+    @Override
+    public Long selectCountList(Long dirId) {
+        QueryWrapper<DocInfo> wrapper = new QueryWrapper();
+        wrapper.eq("dir_id", dirId);
+        return docInfoMapper.selectCount(wrapper);
+    }
 }