知识库卡片接口修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/controller/DocLibraryResource.java

@@ -84,15 +84,9 @@ public class DocLibraryResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "知识库卡片信息")
     @RequestMapping(value = "/card", method = RequestMethod.GET)
-    public ResponseModel<Object> queryDocCard(HttpServletRequest request,
-                                               @RequestParam(value = "offset") Integer offset,
-                                               @RequestParam(value = "end") Integer end,
-                                               @RequestParam(value = "filterByCollection") String filterByCollection,
-                                               @RequestParam(value = "directoryId", required = false) Long directoryId,
-                                               @RequestParam(value = "docTitle", required = false) String docTitle,
-                                               @RequestParam(value = "createTimeLeft", required = false) String createTimeLeft,
-                                               @RequestParam(value = "createTimeRight", required = false) String createTimeRight) {
-        return ResponseHelper.buildResponse(docLibraryService.queryCardList());
+    public ResponseModel<Object> queryDocCard( @RequestParam(value = "id", required = false) Long id,
+                                               @RequestParam(value = "ids", required = false) List<Long> ids) {
+        return ResponseHelper.buildResponse(docLibraryService.queryCardList(id , ids));
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/orm/dao/DocContentMapper.java

@@ -29,7 +29,7 @@ public interface DocContentMapper extends BaseMapper<KnowledgeDocContent> {
 
     List<Map<String,Object>> queryDocBaseInfoList(Map<String, Object> paramMap);
 
-    List<Map<String,Object>> queryDocCardList();
+    List<Map<String,Object>> queryDocCardList(@Param("id")Long id, @Param("ids") List<Long> ids);
 
     List<Map<String,Object>> queryCardCount();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-knowledgebase-biz/src/main/java/com/yeejoin/amos/knowledgebase/face/service/DocLibraryService.java

@@ -181,12 +181,21 @@ public class DocLibraryService {
         return page;
     }
 
-    public Map<String,Object> queryCardList(){
-        List<Map<String, Object>> content = docContentService.getBaseMapper().queryDocCardList();
+    public Map<String,Object> queryCardList(Long id, List<Long> ids){
+        List<Map<String, Object>> content = docContentService.getBaseMapper().queryDocCardList(id, ids);
         List<Map<String, Object>> countMap = docContentService.getBaseMapper().queryCardCount();
-        Map<String, Object> resultMap = new HashMap<>();
+        Map<String, Object> resultMap = new HashMap<>(2);
         resultMap.put("content",content);
-        countMap.forEach(e->resultMap.put(e.get("directoryName").toString(),e.get("num")));
+        List<Map<String, Object>> list = new ArrayList<>();
+        countMap.forEach(e-> {
+            Map<String, Object> map = new HashMap<>(2);
+            map.put("value",e.get("num"));
+            map.put("name",e.get("categoryName"));
+            map.put("id",e.get("id"));
+            list.add(map);
+        });
+        resultMap.put("count", list);
+        return resultMap;
     }
 
 

amos-boot-system-knowledgebase/src/main/resources/mapper/KnowledgeDocContentMapper.xml

@@ -253,70 +253,44 @@
         SELECT SEQUENCE_NBR FROM knowledge_doc_content WHERE DOC_STATUS = "PUBLISHED"
     </select>
 
-    <select id="queryDocCardList"  resultType="map">
+    <select id="queryDocCardList" parameterType="map" resultType="map">
         SELECT
-            SEQUENCE_NBR sequenceNbr,
-            REC_DATE recDate,
-            DOC_STATUS docStatus,
-            CREATE_TIME createTime,
-            USER_ID userId,
-            AUDIT_STATUS auditStatus,
-            REJECTION_COMMENT rejectionComment,
-            AUDITOR_USER_ID auditorUserId,
-            ORG_CODE orgCode,
-            DOC_TITLE docTitle,
-            DIRECTORY_ID directoryId,
-            ( SELECT kdc.CATEGORY_NAME FROM knowledge_doc_category kdc WHERE kdc.SEQUENCE_NBR = DIRECTORY_ID ) directoryName,
-            releaseDate,
-            excuteDate,
-            IFNULL( collectNum, 0 ) collectNum,
-            IFNULL( quoteNum, 0 ) quoteNum,
-            IFNULL( collect, "UNCOLLECT" ) collect
+            kdc.SEQUENCE_NBR id,
+            kdc.DOC_TITLE title,
+            cat.CATEGORY_NAME categoryName
         FROM
-            knowledge_doc_content doct
-                LEFT JOIN (
-                SELECT
-                    INSTANCE_ID,
-                    MAX( CASE FIELD_NAME WHEN 'releaseDate' THEN FIELD_VALUE ELSE NULL END ) AS releaseDate,
-                    MAX( CASE FIELD_NAME WHEN 'excuteDate' THEN FIELD_VALUE ELSE NULL END ) AS excuteDate
-                FROM
-                    knowledge_dynamics_value
-                GROUP BY
-                    INSTANCE_ID
-            ) fieldt ON doct.SEQUENCE_NBR = fieldt.INSTANCE_ID
-                LEFT JOIN ( SELECT ENTITY_ID, COUNT( 1 ) collectNum FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT" GROUP BY ENTITY_ID ) coll ON doct.SEQUENCE_NBR = coll.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_COUNT quoteNum FROM knowledge_interaction_count WHERE OPERATE_TYPE = "PUBLISH" AND ENTITY_TYPE = "DOC" ) quot ON doct.SEQUENCE_NBR = quot.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_TYPE collect FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT" AND USER_ID = 3780967 ) favor ON doct.SEQUENCE_NBR = favor.ENTITY_ID
+            knowledge_doc_content kdc LEFT JOIN knowledge_doc_category cat ON cat.SEQUENCE_NBR = kdc.DIRECTORY_ID
         WHERE
-            DOC_STATUS = 'PUBLISHED'
-        ORDER BY
-            directoryName DESC,
-            create_time DESC
+        kdc.DOC_STATUS = "PUBLISHED"
+        <if test="id != null and id != ''">
+            AND  cat.PARENT_ID =  #{id}
+        </if>
+        <if test="ids != null and ids.size > 0">
+            AND  cat.PARENT_ID not in
+            <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ORDER BY kdc.CREATE_TIME DESC
     </select>
 
     <select id="queryCardCount" resultType="map">
         SELECT
-
-            ( SELECT kdc.CATEGORY_NAME FROM knowledge_doc_category kdc WHERE kdc.SEQUENCE_NBR = DIRECTORY_ID ) directoryName,
-            COUNT(SEQUENCE_NBR) as num
+            SEQUENCE_NBR id,
+            CATEGORY_NAME categoryName,
+            (
+            SELECT
+                COUNT( doc.SEQUENCE_NBR )
+            FROM
+                knowledge_doc_content doc
+                LEFT JOIN knowledge_doc_category kdc ON kdc.SEQUENCE_NBR = doc.DIRECTORY_ID
+            WHERE
+                kdc.PARENT_ID = k.SEQUENCE_NBR
+            ) num
         FROM
-            knowledge_doc_content doct
-                LEFT JOIN (
-                SELECT
-                    INSTANCE_ID,
-                    MAX( CASE FIELD_NAME WHEN 'releaseDate' THEN FIELD_VALUE ELSE NULL END ) AS releaseDate,
-                    MAX( CASE FIELD_NAME WHEN 'excuteDate' THEN FIELD_VALUE ELSE NULL END ) AS excuteDate
-                FROM
-                    knowledge_dynamics_value
-                GROUP BY
-                    INSTANCE_ID
-            ) fieldt ON doct.SEQUENCE_NBR = fieldt.INSTANCE_ID
-                LEFT JOIN ( SELECT ENTITY_ID, COUNT( 1 ) collectNum FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT" GROUP BY ENTITY_ID ) coll ON doct.SEQUENCE_NBR = coll.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_COUNT quoteNum FROM knowledge_interaction_count WHERE OPERATE_TYPE = "PUBLISH" AND ENTITY_TYPE = "DOC" ) quot ON doct.SEQUENCE_NBR = quot.ENTITY_ID
-                LEFT JOIN ( SELECT ENTITY_ID, OPERATE_TYPE collect FROM knowledge_interaction_record WHERE OPERATE_TYPE = "COLLECT"  ) favor ON doct.SEQUENCE_NBR = favor.ENTITY_ID
+            knowledge_doc_category k
         WHERE
-            DOC_STATUS = 'PUBLISHED'
-        GROUP BY DIRECTORY_ID
+            PARENT_ID = 0
 
     </select>
 </mapper>