作者：张哲

时间：2022/12/7
类型：开发
描述：后台知识分类接口联调

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

@@ -17,7 +17,6 @@ import com.redxun.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.runtime.logging.Logger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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

@@ -1,11 +1,15 @@
 package com.redxun.knowledge.entity.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.redxun.knowledge.entity.dao.KnowledgeCategory;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,6 +33,22 @@ public class KnowledgeCategoryAdminVo implements Serializable {
     private Integer sort;
     //是否是系统预制节点;0-不是 1-是
     private Integer isSys;
+    //操作人
+    private String updateBy;
+    //操作时间
+    @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 updateTime;
+    //层级
+    public Integer level;
     //孩子节点数据
     private List<KnowledgeCategoryAdminVo> children;
     //父亲节点数据

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

@@ -47,7 +47,7 @@ public interface KnowledgeCategoryMapper extends BaseDao<KnowledgeCategory> {
      * @param pkId
      * @param temp
      */
-    void swapSort(@Param("pkId") String pkId, @Param("temp") int temp);
+    void swapSort(@Param("pkId") String pkId, @Param("sort") int sort);
 
     /**
      * PC端查询分类信息,无分页

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

@@ -82,8 +82,13 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
                 collect(Collectors.toList());
         // 查询其孩子节点
         collect.forEach(e -> {
+            e.setLevel(1);
             List<KnowledgeCategoryAdminVo> childrens = findChildrens(e);
-            e.setChildren(childrens);
+            if (childrens.size() == 0){
+                e.setChildren(null);
+            } else {
+                e.setChildren(childrens);
+            }
         });
         // 把数据放回到分页中，结果返回
         page.setRecords(collect);
@@ -206,8 +211,13 @@ public class KnowledgeCategoryServiceImpl extends SuperServiceImpl<KnowledgeCate
         List<KnowledgeCategoryAdminVo> knowledgeCategories = knowledgeCategorieChild.stream().sorted(Comparator.comparingInt(KnowledgeCategoryAdminVo::getSort)).collect(Collectors.toList());
         knowledgeCategoryAdminVo.setChildren(knowledgeCategories);
         knowledgeCategories.forEach(e -> {
+            e.setLevel(knowledgeCategoryAdminVo.getLevel() + 1);
             List<KnowledgeCategoryAdminVo> allChildren = findChildrens(e);
-            e.setChildren(allChildren);
+            if (allChildren.size() == 0){
+                e.setChildren(null);
+            } else {
+                e.setChildren(allChildren);
+            }
         });
         return knowledgeCategories;
     }

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

@@ -47,7 +47,7 @@
         <if test="@rx.Ognl@isNotEmpty(params.name)">
             NAME LIKE '%' || #{params.name} || '%'
         </if>
-        and IS_DEL = 0
+        and IS_DEL = 0 and PARENT = 0
     </where>
     ORDER BY SORT ASC,UPDATE_TIME_ DESC
     </select>

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

@@ -109,7 +109,6 @@
         set
             SORT = #{sort}
         where PK_ID = #{newsId}
-        <foreach collection="array"  item="1"></foreach>
     </update>
 
     <delete id="deleteNews">