Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/redxun/knowledge/controller/KnowledgeApprovalNodeController.java

@@ -4,10 +4,9 @@ package com.redxun.knowledge.controller;
 import com.redxun.common.annotation.ClassDefine;
 import com.redxun.common.base.db.BaseService;
 
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.redxun.common.base.entity.JsonResult;
-import com.redxun.common.tool.StringUtils;
 import com.redxun.knowledge.entity.dao.KnowledgeApprovalNode;
+import com.redxun.knowledge.entity.vo.KnowledgeApprovalVo;
 import com.redxun.knowledge.service.KnowledgeApprovalNodeServiceImpl;
 import com.redxun.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -15,29 +14,36 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
+
 import java.util.List;
 
 @Slf4j
 @RestController
 @RequestMapping("/api-knowledge/knowledge/knowledgeApprovalNode")
 @Api(tags = "业务--知识审批节点表")
-@ClassDefine(title = "业务--知识审批节点表",alias = "KnowledgeApprovalNodeController",path = "/knowledge/knowledgeApprovalNode",packages = "",packageName = "子系统名称")
+@ClassDefine(title = "业务--知识审批节点表", alias = "KnowledgeApprovalNodeController", path = "/knowledge/knowledgeApprovalNode", packages = "", packageName = "子系统名称")
 public class KnowledgeApprovalNodeController extends BaseController<KnowledgeApprovalNode> {
 
-@Autowired
-KnowledgeApprovalNodeServiceImpl knowledgeApprovalNodeService;
-
-
-@Override
-public BaseService getBaseService() {
-return knowledgeApprovalNodeService;
-}
-
-@Override
-public String getComment() {
-return "业务--知识审批节点表";
-}
-
+    @Autowired
+    KnowledgeApprovalNodeServiceImpl knowledgeApprovalNodeService;
+
+    @Override
+    public BaseService getBaseService() {
+        return knowledgeApprovalNodeService;
+    }
+
+    @Override
+    public String getComment() {
+        return "业务--知识审批节点表";
+    }
+
+    @ApiOperation("查询审核流程节点列表")
+    @GetMapping("queryApprovalNodes")
+    public JsonResult queryApprovalNodes() {
+        JsonResult jsonResult = JsonResult.getSuccessResult("获取数据成功");
+        List<KnowledgeApprovalVo> approvalNodes = knowledgeApprovalNodeService.queryApprovalNodes();
+        jsonResult.setData(approvalNodes);
+        return jsonResult;
+    }
 }
 

src/main/java/com/redxun/knowledge/controller/KnowledgeController.java

@@ -5,22 +5,21 @@ import com.redxun.common.annotation.ClassDefine;
 import com.redxun.common.base.db.BaseService;
 import com.redxun.common.base.entity.JsonResult;
 import com.redxun.knowledge.entity.dao.Knowledge;
+import com.redxun.knowledge.entity.dto.knowledgeDto;
+import com.redxun.knowledge.entity.vo.KnowledgeApprovalVo;
 import com.redxun.knowledge.service.KnowledgeServiceImpl;
 import com.redxun.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @Slf4j
 @RestController
-@RequestMapping("/api-knowledge/knowledge/knowledge")
+@RequestMapping("/api-knowledge/knowledge")
 @Api(tags = "业务--知识表")
 @ClassDefine(title = "业务--知识表", alias = "KnowledgeController", path = "/knowledge/knowledge", packages = "", packageName = "子系统名称")
 public class KnowledgeController extends BaseController<Knowledge> {
@@ -41,12 +40,20 @@ public class KnowledgeController extends BaseController<Knowledge> {
 
     @ApiOperation("根据分类id查询全部维基知识")
     @GetMapping("/findAllWiki/{categoryId}")
-    public JsonResult findAllWiki(@PathVariable("categoryId") String categoryId){
+    public JsonResult findAllWiki(@PathVariable("categoryId") String categoryId) {
         JsonResult jsonResult = JsonResult.getSuccessResult("返回数据成功!");
         List<Knowledge> wikiList = knowledgeService.findAllWiki(categoryId);
         jsonResult.setData(wikiList);
         return jsonResult;
     }
 
+    @ApiOperation("新增知识")
+    @GetMapping("create")
+    public JsonResult create(@RequestBody knowledgeDto knowledgeDto) {
+        JsonResult jsonResult = JsonResult.getSuccessResult("新增知识成功！");
+        String pkId = knowledgeService.create(knowledgeDto);
+        jsonResult.setData(pkId);
+        return jsonResult;
+    }
 }
 

src/main/java/com/redxun/knowledge/entity/dto/knowledgeDto.java

@@ -0,0 +1,29 @@
+package com.redxun.knowledge.entity.dto;
+
+import lombok.Data;
+
+// 知识DTO
+@Data
+public class knowledgeDto {
+
+    // 知识分类ID
+    private String categoryId;
+
+    // 知识类型 1-文档知识 2-维基知识
+    private Integer type;
+
+    // 知识标题
+    private String title;
+
+    // 知识概要
+    private String summary;
+
+    // 知识内容
+    private String content;
+
+    // 附件ID
+    private String attachment;
+
+    // 附件类型 1-WORD(.doc、.docx) 2-PDF(.pdf) 3-PPT(.pptx) 4-EXCEL(.xls、.xlsx)
+    private Integer attachmentType;
+}

src/main/java/com/redxun/knowledge/entity/vo/KnowledgeApprovalVo.java

@@ -0,0 +1,46 @@
+package com.redxun.knowledge.entity.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+// 知识审核节点VO
+@Data
+public class KnowledgeApprovalVo {
+    // 主键
+    private String pkId;
+
+    // 审核节点名称
+    private String name;
+
+    // 节点审核人ID
+    private String approverId;
+
+    // 节点审核人姓名
+    private String approverName;
+
+    // 实际审核人ID
+    private String actualApprover;
+
+    // 实际审核人姓名
+    private String actualApproverName;
+
+    // 节点审核时间
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JSONField(
+            format = "yyyy-MM-dd HH:mm:ss"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date approvalTime;
+
+    // 审核状态 ：提交审核 审核通过 审核通过 审核驳回
+    private String approvalStatus;
+}

src/main/java/com/redxun/knowledge/mapper/KnowledgeApprovalNodeMapper.java

@@ -1,13 +1,17 @@
 package com.redxun.knowledge.mapper;
 
 import com.redxun.knowledge.entity.dao.KnowledgeApprovalNode;
+import com.redxun.knowledge.entity.vo.KnowledgeApprovalVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.redxun.common.base.db.BaseDao;
 
+import java.util.List;
+
 /**
-* 业务--知识审批节点表数据库访问层
-*/
+ * 业务--知识审批节点表数据库访问层
+ */
 @Mapper
 public interface KnowledgeApprovalNodeMapper extends BaseDao<KnowledgeApprovalNode> {
 
+    List<KnowledgeApprovalVo> queryApprovalNodes();
 }

src/main/java/com/redxun/knowledge/service/KnowledgeApprovalNodeServiceImpl.java

@@ -8,17 +8,19 @@ import com.redxun.common.base.db.BaseService;
 import com.redxun.common.tool.IdGenerator;
 import com.redxun.common.service.impl.SuperServiceImpl;
 import com.redxun.knowledge.entity.dao.KnowledgeApprovalNode;
+import com.redxun.knowledge.entity.vo.KnowledgeApprovalVo;
 import com.redxun.knowledge.mapper.KnowledgeApprovalNodeMapper;
 import com.redxun.knowledge.entity.dao.KnowledgeApprovalNode;
 import com.redxun.knowledge.mapper.KnowledgeApprovalNodeMapper;
 import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Resource;
 
 /**
-* [业务--知识审批节点表]业务服务类
-*/
+ * [业务--知识审批节点表]业务服务类
+ */
 @Service
 public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<KnowledgeApprovalNodeMapper, KnowledgeApprovalNode> implements BaseService<KnowledgeApprovalNode> {
 
@@ -30,4 +32,7 @@ public class KnowledgeApprovalNodeServiceImpl extends SuperServiceImpl<Knowledge
         return knowledgeApprovalNodeMapper;
     }
 
+    public List<KnowledgeApprovalVo> queryApprovalNodes() {
+        return knowledgeApprovalNodeMapper.queryApprovalNodes();
+    }
 }

src/main/java/com/redxun/knowledge/service/KnowledgeServiceImpl.java

@@ -8,6 +8,7 @@ import com.redxun.common.base.db.BaseService;
 import com.redxun.common.tool.IdGenerator;
 import com.redxun.common.service.impl.SuperServiceImpl;
 import com.redxun.knowledge.entity.dao.Knowledge;
+import com.redxun.knowledge.entity.dto.knowledgeDto;
 import com.redxun.knowledge.mapper.KnowledgeMapper;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
@@ -43,4 +44,15 @@ public class KnowledgeServiceImpl extends SuperServiceImpl<KnowledgeMapper, Know
         return knowledgeWikiList;
     }
 
+    public String create(knowledgeDto knowledgeDto) {
+        if (knowledgeDto != null) {
+            Knowledge knowledge = new Knowledge();
+            knowledge.setPkId(IdGenerator.getIdStr());
+
+            insert(knowledge);
+            return knowledge.getPkId();
+        }
+
+        return "";
+    }
 }

src/main/resources/mapper/knowledge/KnowledgeApprovalNodeMapper.xml

@@ -3,24 +3,26 @@
 <mapper namespace="com.redxun.knowledge.mapper.KnowledgeApprovalNodeMapper">
 
     <resultMap id="KnowledgeApprovalNode" type="com.redxun.knowledge.entity.dao.KnowledgeApprovalNode">
-                <id property="pkId" column="PK_ID" jdbcType="VARCHAR"/>
-                <result property="name" column="NAME" jdbcType="VARCHAR"/>
-                <result property="approverId" column="APPROVER_ID" jdbcType="VARCHAR"/>
-                <result property="approverName" column="APPROVER_NAME" jdbcType="VARCHAR"/>
-                <result property="isFinal" column="IS_FINAL" jdbcType="INTEGER"/>
-                <result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
-                <result property="companyId" column="COMPANY_ID_" jdbcType="VARCHAR"/>
-                <result property="createDepId" column="CREATE_DEP_ID_" jdbcType="VARCHAR"/>
-                <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
-                <result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
-                <result property="createTime" column="CREATE_TIME_" jdbcType="DATE"/>
-                <result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
-                <result property="updateTime" column="UPDATE_TIME_" jdbcType="DATE"/>
+        <id property="pkId" column="PK_ID" jdbcType="VARCHAR"/>
+        <result property="name" column="NAME" jdbcType="VARCHAR"/>
+        <result property="approverId" column="APPROVER_ID" jdbcType="VARCHAR"/>
+        <result property="approverName" column="APPROVER_NAME" jdbcType="VARCHAR"/>
+        <result property="isFinal" column="IS_FINAL" jdbcType="INTEGER"/>
+        <result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
+        <result property="companyId" column="COMPANY_ID_" jdbcType="VARCHAR"/>
+        <result property="createDepId" column="CREATE_DEP_ID_" jdbcType="VARCHAR"/>
+        <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR"/>
+        <result property="createBy" column="CREATE_BY_" jdbcType="VARCHAR"/>
+        <result property="createTime" column="CREATE_TIME_" jdbcType="DATE"/>
+        <result property="updateBy" column="UPDATE_BY_" jdbcType="VARCHAR"/>
+        <result property="updateTime" column="UPDATE_TIME_" jdbcType="DATE"/>
     </resultMap>
 
 
     <select id="query" resultType="com.redxun.knowledge.entity.dao.KnowledgeApprovalNode" parameterType="java.util.Map">
-        select PK_ID,NAME,APPROVER_ID,APPROVER_NAME,IS_FINAL,IS_DEL,COMPANY_ID_,CREATE_DEP_ID_,TENANT_ID_,CREATED_BY_,CREATED_TIME_,UPDATED_BY_,UPDATED_TIME_ from KM_KNOWLEDGE_APPROVAL_NODE
+        select
+        PK_ID,NAME,APPROVER_ID,APPROVER_NAME,IS_FINAL,IS_DEL,COMPANY_ID_,CREATE_DEP_ID_,TENANT_ID_,CREATED_BY_,CREATED_TIME_,UPDATED_BY_,UPDATED_TIME_
+        from KM_KNOWLEDGE_APPROVAL_NODE
         <where>
             <if test="@rx.Ognl@isNotEmpty(w.whereSql)">
                 ${w.whereSql}
@@ -30,10 +32,16 @@
             ORDER BY ${w.orderBySql}
         </if>
         <if test="@rx.Ognl@isEmpty(w.orderBySql)">
-            ORDER BY  PK_ID DESC
+            ORDER BY PK_ID DESC
         </if>
     </select>
 
+    <select id="queryApprovalNodes" resultType="com.redxun.knowledge.entity.vo.KnowledgeApprovalVo">
+        SELECT PK_ID, NAME, APPROVER_ID, APPROVER_NAME, '--' AS APPROVAL_STATUS
+        FROM KM_KNOWLEDGE_APPROVAL_NODE
+        WHERE IS_DEL = 0
+        ORDER BY IS_FINAL ASC
+    </select>
 </mapper>