提交知识库查询

know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java

@@ -0,0 +1,40 @@
+package com.supervision.knowsub.controller.knowledge;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@Tag(name = "知识流程")
+@RequiredArgsConstructor
+@RequestMapping("knowledgeFlow")
+public class KnowledgeFlowController {
+
+    @Operation(summary = "分页查询知识审批流程")
+    @GetMapping("queryKnowledgeFlowPage")
+    public void queryKnowledgeFlowPage() {
+
+    }
+
+    @Operation(summary = "审批知识流程")
+    @PostMapping("processKnowledgeFlow")
+    public void processKnowledgeFlow() {
+
+    }
+
+    @Operation(summary = "查询知识库流转记录")
+    @GetMapping("queryKnowledgeFlowRecord")
+    public void queryKnowledgeFlowRecord(String knowledgeId){
+
+    }
+
+
+
+
+}

know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java

@@ -1,5 +1,8 @@
 package com.supervision.knowsub.controller.knowledge;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.supervision.knowsub.controller.service.KnowledgeManageService;
+import com.supervision.knowsub.model.Knowledge;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -14,12 +17,14 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "知识库查询")
 @RequiredArgsConstructor
 @RequestMapping("knowledge")
-public class KnowledgeController {
+public class KnowledgeManageController {
+
+    private final KnowledgeManageService knowledgeManageService;
 
     @Operation(summary = "查询知识库分页")
     @GetMapping("queryKnowledgePage")
-    public void queryKnowledgePage() {
+    public IPage<Knowledge> queryKnowledgePage(Integer status, String title, String deptName, Integer pageNum, Integer pageSize) {
-
+        return knowledgeManageService.queryKnowledgePage(status, title, deptName, pageNum, pageSize);
     }
 
     @Operation(summary = "新增知识库")
@@ -34,15 +39,23 @@ public class KnowledgeController {
 
     }
 
+    @Operation(summary = "召回知识库")
+    @GetMapping("recallKnowledge")
+    public void recallKnowledge() {
+
+    }
+
+    @Operation(summary = "查看知识的详细信息")
+    @GetMapping("queryKnowledgeDetail")
+    public void queryKnowledgeDetail(String knowledgeId) {
+
+    }
+
     @Operation(summary = "删除知识库")
     @GetMapping("deleteKnowledge")
     public void deleteKnowledge() {
 
     }
 
-    @Operation(summary = "查询知识库流转记录")
-    @GetMapping("queryKnowledgeFlowRecord")
-    public void queryKnowledgeFlowRecord(String knowledgeId){
 
 }
-}

know_sub_business/src/main/java/com/supervision/knowsub/controller/service/KnowledgeManageService.java

@@ -0,0 +1,9 @@
+package com.supervision.knowsub.controller.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.supervision.knowsub.model.Knowledge;
+
+public interface KnowledgeManageService {
+
+    IPage<Knowledge> queryKnowledgePage(Integer status,String title, String deptName, Integer pageNum, Integer pageSize);
+}

know_sub_business/src/main/java/com/supervision/knowsub/controller/service/impl/KnowledgeManageServiceImpl.java

@@ -0,0 +1,29 @@
+package com.supervision.knowsub.controller.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.supervision.knowsub.controller.service.KnowledgeManageService;
+import com.supervision.knowsub.model.Knowledge;
+import com.supervision.knowsub.service.KnowledgeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class KnowledgeManageServiceImpl implements KnowledgeManageService {
+
+    private final KnowledgeService knowledgeService;
+
+
+    @Override
+    public IPage<Knowledge> queryKnowledgePage(Integer status, String title, String publishDeptName, Integer pageNum, Integer pageSize) {
+        return knowledgeService.lambdaQuery().eq(ObjectUtil.isNotEmpty(status), Knowledge::getStatus, status)
+                .like(StrUtil.isNotBlank(title), Knowledge::getTitle, title)
+                .like(StrUtil.isNotBlank(publishDeptName), Knowledge::getPublishDept, publishDeptName)
+                .page(new Page<>(pageNum, pageSize));
+    }
+}

know_sub_model/src/main/java/com/supervision/knowsub/model/Knowledge.java

@@ -1,9 +1,7 @@
 package com.supervision.knowsub.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
+
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -37,9 +35,9 @@ public class Knowledge implements Serializable {
     private String baseId;
 
     /**
-     * 发文部门ID
+     * 发文部门(部门名称全文)
      */
-    private String publishDeptId;
+    private String publishDept;
 
     /**
      * 知识来源 1人工添加
@@ -47,33 +45,37 @@ public class Knowledge implements Serializable {
     private Integer knowledgeFrom;
 
     /**
-     * 流转状态 1草稿 2待审批 3审批中 4已退回 5已失效
+     * 流转状态 1草稿 2待审批 3驳回 4通过 5删除  6已失效
      */
     private Integer status;
 
     /**
-     * 报送部门
+     * 报送部门ID
      */
-    private String submittedDept;
+    private String submittedDeptId;
 
     /**
      * 创建人ID
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createUserId;
 
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新人
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateUserId;
 
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @TableField(exist = false)

know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml

@@ -9,10 +9,10 @@
             <result property="title" column="title" jdbcType="VARCHAR"/>
             <result property="contentId" column="content_id" jdbcType="VARCHAR"/>
             <result property="baseId" column="base_id" jdbcType="VARCHAR"/>
-            <result property="publishDeptId" column="publish_dept_id" jdbcType="VARCHAR"/>
+            <result property="publishDept" column="publish_dept_id" jdbcType="VARCHAR"/>
             <result property="knowledgeFrom" column="knowledge_from" jdbcType="INTEGER"/>
             <result property="status" column="status" jdbcType="INTEGER"/>
-            <result property="submittedDept" column="submitted_dept" jdbcType="VARCHAR"/>
+            <result property="submittedDeptId" column="submitted_dept" jdbcType="VARCHAR"/>
             <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/>
@@ -21,8 +21,8 @@
 
     <sql id="Base_Column_List">
         id,title,content_id,
-        base_id,publish_dept_id,knowledge_from,
+        base_id,publish_dept,knowledge_from,
-        status,submitted_dept,create_user_id,
+        status,submitted_dept_id,create_user_id,
         create_time,update_user_id,update_time
     </sql>
 </mapper>