feat: 知识库文档模糊查询

src/main/java/cn/com/poc/knowledge/aggregate/KnowledgeService.java

@@ -50,7 +50,7 @@ public interface KnowledgeService {
     /**
      * 获取用户知识库
      */
-    List<BizKnowledgeDocumentEntity> getList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception;
+    List<BizKnowledgeDocumentEntity> searchDocuments(String search, String trainStatus,List<Integer> kdIds, PagingInfo pagingInfo) throws Exception;
 
     /**
      * 获取用户知识库文档

src/main/java/cn/com/poc/knowledge/aggregate/impl/KnowledgeServiceImpl.java

@@ -202,13 +202,13 @@ public class KnowledgeServiceImpl implements KnowledgeService {
     }
 
     @Override
-    public List<BizKnowledgeDocumentEntity> getList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception {
+    public List<BizKnowledgeDocumentEntity> searchDocuments(String search, String trainStatus, List<Integer> kdIds, PagingInfo pagingInfo) throws Exception {
         List<BizKnowledgeDocumentEntity> result = new ArrayList<>();
         String memberId = BlContext.getCurrentUser().getUserId().toString();
         if (StringUtils.isBlank(memberId)) {
             memberId = BlContext.getCurrentUserNotException().getUserId().toString();
         }
-        List<KnowledgeQueryItem> knowledgeQueryItems = bizKnowledgeDocumentService.searchKnowledge(search, trainStatus, memberId, null, pagingInfo);
+        List<KnowledgeQueryItem> knowledgeQueryItems = bizKnowledgeDocumentService.searchKnowledge(search, trainStatus, memberId, null, kdIds, pagingInfo);
         if (CollectionUtils.isNotEmpty(knowledgeQueryItems)) {
             result = knowledgeQueryItems.stream().map(item -> {
                 BizKnowledgeDocumentEntity entity = new BizKnowledgeDocumentEntity();

src/main/java/cn/com/poc/knowledge/query/KnowledgeQuery.sql

@@ -17,4 +17,5 @@ where bkd.is_deleted = 'N'
 <<and bkd.document_name = :documentName>>
 <<and bkd.train_status =:trainStatus>>
 <<and locate(:searchDocumentName,bkd.document_name) >>
+<<and bkd.kd_id in (:kdIds)>>
 order by bkd.upload_time desc
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/query/KnowledgeQueryCondition.java

 package cn.com.poc.knowledge.query;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * Query Condition class for KnowledgeQuery
@@ -50,4 +51,14 @@ public class KnowledgeQueryCondition implements Serializable{
     public void setSearchDocumentName(String searchDocumentName) {
         this.searchDocumentName = searchDocumentName;
     }
+
+    private List<Integer> kdIds;
+
+    public List<Integer> getKdIds() {
+        return kdIds;
+    }
+
+    public void setKdIds(List<Integer> kdIds) {
+        this.kdIds = kdIds;
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/rest/KnowledgeRest.java

@@ -61,9 +61,12 @@ public interface KnowledgeRest extends BaseRest {
     Boolean trainKnowledge(@RequestBody TrainKnowledgeDto dto) throws Exception;
 
     /**
-     * 获取用户知识库
+     * 模糊查询知识库文档
      */
-    List<BizKnowledgeDocumentDto> getList(@RequestParam(required = false) String search, @RequestParam(required = false) String trainStatus, PagingInfo pagingInfo) throws Exception;
+    List<BizKnowledgeDocumentDto> searchDocuments(@RequestParam(required = false) String search,
+                                                  @RequestParam(required = false) String trainStatus,
+                                                  @RequestParam Integer knowledgeInfoId,
+                                                  PagingInfo pagingInfo) throws Exception;
 
     /**
      * 获取知识库的文档列表

src/main/java/cn/com/poc/knowledge/rest/impl/KnowledgeRestImpl.java

@@ -89,9 +89,24 @@ public class KnowledgeRestImpl implements KnowledgeRest {
     }
 
     @Override
-    public List<BizKnowledgeDocumentDto> getList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception {
+    public List<BizKnowledgeDocumentDto> searchDocuments(String search, String trainStatus, Integer knowledgeInfoId, PagingInfo pagingInfo) throws Exception {
         List<BizKnowledgeDocumentDto> result = new ArrayList<>();
-        List<BizKnowledgeDocumentEntity> entities = knowledgeService.getList(search, trainStatus, pagingInfo);
+        BizKnowledgeInfoEntity bizKnowledgeInfoEntity = bizKnowledgeInfoService.get(knowledgeInfoId);
+
+        if (bizKnowledgeInfoEntity == null) {
+            throw new BusinessException("知识库不存在");
+        }
+        String kdIds = bizKnowledgeInfoEntity.getKdIds();
+        if (StringUtils.isBlank(kdIds)) {
+            return result;
+        }
+        List<Integer> kdIdList = JsonUtils.deSerialize(kdIds, new TypeReference<List<Integer>>() {
+        }.getType());
+        if (CollectionUtils.isEmpty(kdIdList)) {
+            return result;
+        }
+
+        List<BizKnowledgeDocumentEntity> entities = knowledgeService.searchDocuments(search, trainStatus, kdIdList, pagingInfo);
         if (CollectionUtils.isNotEmpty(entities)) {
             result = entities.stream().map(entity -> {
                 BizKnowledgeDocumentDto dto = new BizKnowledgeDocumentDto();

src/main/java/cn/com/poc/knowledge/service/BizKnowledgeDocumentService.java

@@ -19,5 +19,5 @@ public interface BizKnowledgeDocumentService extends BaseService {
 
     Boolean deleted(Integer kdId);
 
-    List<KnowledgeQueryItem> searchKnowledge(String document,String trainStatus, String memberId, String documentName, PagingInfo pagingInfo);
+    List<KnowledgeQueryItem> searchKnowledge(String document, String trainStatus, String memberId, String documentName, List<Integer> kdIds, PagingInfo pagingInfo);
 }
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/service/impl/BizKnowledgeDocumentServiceImpl.java

@@ -81,12 +81,13 @@ public class BizKnowledgeDocumentServiceImpl extends BaseServiceImpl
     }
 
     @Override
-    public List<KnowledgeQueryItem> searchKnowledge(String searchDocumentName, String trainStatus, String memberId, String documentName, PagingInfo pagingInfo) {
+    public List<KnowledgeQueryItem> searchKnowledge(String searchDocumentName, String trainStatus, String memberId, String documentName, List<Integer> kdIds, PagingInfo pagingInfo) {
         KnowledgeQueryCondition condition = new KnowledgeQueryCondition();
         condition.setMemberId(memberId);
         condition.setDocumentName(documentName);
         condition.setTrainStatus(trainStatus);
         condition.setSearchDocumentName(searchDocumentName);
+        condition.setKdIds(kdIds);
         return this.sqlDao.query(condition, KnowledgeQueryItem.class, pagingInfo);
     }
 }
\ No newline at end of file