update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java

@@ -1,30 +1,29 @@
 package org.jeecg.modules.database.controller;
 
-import java.util.Arrays;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.database.entity.DocumentLibrary;
-import org.jeecg.modules.database.service.IDocumentLibraryService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.database.entity.DocumentLibrary;
+import org.jeecg.modules.database.service.IDocumentLibraryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.v3.oas.annotations.Operation;
+
-import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.Arrays;
-import org.jeecg.common.aspect.annotation.AutoLog;
+import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 /**
-  *
  * @Description: 知识库
  * @Author: jeecg-boot
  * @Date: 2024-08-21
@@ -60,6 +59,24 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
         return Result.OK(pageList);
     }
 
+    @Operation(summary = "知识库-文档树查询")
+    @GetMapping(value = "/tree")
+    public Result<List<DocumentLibrary>> tree(@RequestParam(name = "parentId") String parentId, HttpServletRequest req) {
+        DocumentLibrary documentLibrary = new DocumentLibrary();
+        if (StringUtils.isBlank(parentId)) {
+            documentLibrary.setParentId(null);
+        } else {
+            documentLibrary.setParentId(parentId);
+            DocumentLibrary parent = documentLibraryService.getById(parentId);
+            if (StringUtils.equals(parent.getType(), "DOCUMENT")) {
+                return Result.OK();
+            }
+        }
+        QueryWrapper<DocumentLibrary> queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap());
+        List<DocumentLibrary> pageList = documentLibraryService.list(queryWrapper);
+        return Result.OK(pageList);
+    }
+
     /**
      * 添加
      *

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/DocumentLibrary.java

@@ -1,21 +1,17 @@
 package org.jeecg.modules.database.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 知识库
@@ -31,39 +27,70 @@ import lombok.experimental.Accessors;
 public class DocumentLibrary implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
+     * 主键
+     */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
+    /**
+     * 创建日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private java.lang.String updateBy;
-	/**更新日期*/
+    /**
+     * 更新日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private java.lang.String sysOrgCode;
-	/**文档标题*/
+    /**
+     * 文档标题
+     */
     @Excel(name = "文档标题", width = 15)
     @Schema(description = "文档标题")
     private java.lang.String title;
-	/**文档标签*/
+    /**
+     * 文档标签
+     */
     @Excel(name = "文档标签", width = 15)
     @Schema(description = "文档标签")
     private java.lang.String tags;
-	/**文档内容*/
+    /**
+     * 文档内容
+     */
     @Excel(name = "文档内容", width = 15)
     @Schema(description = "文档内容")
     private java.lang.String content;
+
+    /**
+     * 父级ID
+     */
+    @Excel(name = "父级ID", width = 15)
+    @Schema(description = "父级ID")
+    private java.lang.String parentId;
+    /**
+     * 类型
+     */
+    @Excel(name = "类型", width = 15)
+    @Schema(description = "类型(DOCUMENT/FOLDER)")
+    private java.lang.String type;
 }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentLibraryService.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.database.service;
 
-import org.jeecg.modules.database.entity.DocumentLibrary;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.database.entity.DocumentLibrary;
 
 /**
  * @Description: 知识库