Pārlūkot izejas kodu

接口:知识仓库首页-快捷标签列表

YangL 2 gadi atpakaļ
vecāks
revīzija
7f100d981d

+ 3 - 3
src/main/java/com/redxun/knowledge/controller/KnowledgeController.java

@@ -41,7 +41,7 @@ public class KnowledgeController extends BaseController<Knowledge> {
         return "业务--知识表";
     }
 
-    @ApiOperation("根据分类id查询全部维基知识")
+    @ApiOperation(value = "根据分类id查询全部维基知识", httpMethod = "GET")
     @GetMapping("/findAllWiki/{categoryId}")
     public JsonResult findAllWiki(@PathVariable("categoryId") String categoryId) {
         JsonResult jsonResult = JsonResult.getSuccessResult("返回数据成功!");
@@ -50,7 +50,7 @@ public class KnowledgeController extends BaseController<Knowledge> {
         return jsonResult;
     }
 
-    @ApiOperation("新增知识")
+    @ApiOperation(value = "新增知识", httpMethod = "POST")
     @PostMapping("create")
     public JsonResult create(@Validated @RequestBody knowledgeDto knowledgeDto) {
         JsonResult jsonResult = JsonResult.getSuccessResult("新增知识成功!");
@@ -59,7 +59,7 @@ public class KnowledgeController extends BaseController<Knowledge> {
         return jsonResult;
     }
 
-    @ApiOperation("知识详情")
+    @ApiOperation(value = "知识详情", httpMethod = "GET")
     @GetMapping("info")
     public JsonResult info(@RequestParam(value = "pkId") String pkId) {
         JsonResult jsonResult = JsonResult.getSuccessResult("获取知识详情成功!");

+ 27 - 2
src/main/java/com/redxun/knowledge/controller/KnowledgeLabelController.java

@@ -60,6 +60,31 @@ public class KnowledgeLabelController extends BaseController<KnowledgeLabel> {
         return jsonResult;
     }
 
+    /**
+     * 知识仓库首页-快捷标签列表
+     *
+     * @param tops 返回条数
+     * @return
+     */
+    @ApiOperation(value = "知识仓库首页-快捷标签列表", httpMethod = "GET")
+    @GetMapping("labels")
+    public JsonResult labels(@RequestParam(value = "tops", required = false) Integer tops) {
+        JsonResult jsonResult = JsonResult.getSuccessResult("返回数据成功!");
+
+        if (tops == null) {
+            tops = 24;
+        }
+
+        try {
+            jsonResult.setData(knowledgeLabelService.labels(tops));
+        } catch (Exception e) {
+            jsonResult.setSuccess(false);
+            this.logger.error(ExceptionUtil.getExceptionMessage(e));
+            jsonResult.setMessage(ExceptionUtil.getExceptionMessage(e));
+        }
+        return jsonResult;
+    }
+
     /**
      * 分页条件搜索标签管理列表
      *
@@ -92,7 +117,7 @@ public class KnowledgeLabelController extends BaseController<KnowledgeLabel> {
      * @param status  true 上升  false 下降
      * @return
      */
-    @ApiOperation(value = "调整知识标签排序位置")
+    @ApiOperation(value = "调整知识标签排序位置", httpMethod = "GET")
     @GetMapping("/exchangePosition/{labelId}/{status}")
     public JsonResult exchangePosition(@PathVariable("labelId") String labelId,
                                        @PathVariable("status") Boolean status) {
@@ -106,7 +131,7 @@ public class KnowledgeLabelController extends BaseController<KnowledgeLabel> {
      * @param labelId 标签ID
      * @return
      */
-    @ApiOperation(value = "删除知识标签")
+    @ApiOperation(value = "删除知识标签", httpMethod = "GET")
     @PostMapping("delLabel")
     public JsonResult delLabel(@RequestParam("labelId") String labelId) {
         JsonResult jsonResult = JsonResult.getSuccessResult("删除知识标签成功!");

+ 3 - 0
src/main/java/com/redxun/knowledge/mapper/KnowledgeLabelMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import com.redxun.common.base.db.BaseDao;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,4 +23,6 @@ public interface KnowledgeLabelMapper extends BaseDao<KnowledgeLabel> {
     void updateSort(String labelId, Integer sort);
 
     void delLabel(String labelId);
+
+    List<KnowledgeLabelVo> selectTops(Integer tops);
 }

+ 13 - 0
src/main/java/com/redxun/knowledge/service/KnowledgeLabelServiceImpl.java

@@ -14,6 +14,7 @@ import com.redxun.common.tool.StringUtils;
 import com.redxun.knowledge.common.UserService;
 import com.redxun.knowledge.entity.dao.Banner;
 import com.redxun.knowledge.entity.dao.Knowledge;
+import com.redxun.knowledge.entity.dao.KnowledgeApprove;
 import com.redxun.knowledge.entity.dao.KnowledgeLabel;
 import com.redxun.knowledge.entity.vo.BannerAdminVo;
 import com.redxun.knowledge.entity.vo.KnowledgeLabelVo;
@@ -86,6 +87,18 @@ public class KnowledgeLabelServiceImpl extends SuperServiceImpl<KnowledgeLabelMa
         return page;
     }
 
+    public List<KnowledgeLabelVo> labels(Integer tops) {
+        List<KnowledgeLabelVo> labels = knowledgeLabelMapper.selectTops(tops);
+        labels.forEach(e -> {
+            JPaasUser user = userService.queryUser(e.getOperator());
+            if (user != null) {
+                e.setOperatorName(user.getFullName());
+            }
+        });
+
+        return labels;
+    }
+
     /**
      * 调整知识标签排序位置
      *

+ 15 - 0
src/main/resources/mapper/knowledge/KnowledgeLabelMapper.xml

@@ -60,6 +60,21 @@
         ORDER BY SORT ASC
     </select>
 
+    <select id="selectTops" parameterType="java.lang.Integer" resultType="com.redxun.knowledge.entity.vo.KnowledgeLabelVo">
+        SELECT PK_ID,
+               NAME,
+               SORT,
+               CASE WHEN UPDATE_BY_ IS NULL THEN CREATE_BY_ ELSE UPDATE_BY_ END OPERATOR,
+               CASE
+                   WHEN
+                       UPDATE_TIME_ IS NULL THEN CREATE_TIME_
+                   ELSE UPDATE_TIME_ END                                        OPERATE_TIME
+        FROM KM_KNOWLEDGE_LABEL
+        WHERE IS_DEL = 0
+          AND ROWNUM &lt;= #{tops}
+        ORDER BY SORT ASC
+    </select>
+
     <update id="updateSort" parameterType="java.lang.Object">
         UPDATE KM_KNOWLEDGE_LABEL
         SET SORT = #{sort}