Commit b9cd5390 authored by alex yao's avatar alex yao

feat:获取知识库列表添加文档名称字段

parent 084105cc
package cn.com.poc.knowledge.dto;
import java.util.List;
public class QueryKnowledgeDocumentDto extends BizKnowledgeInfoDto {
private List<String> documentNames;
public List<String> getDocumentNames() {
return documentNames;
}
public void setDocumentNames(List<String> documentNames) {
this.documentNames = documentNames;
}
}
package cn.com.poc.knowledge.rest; package cn.com.poc.knowledge.rest;
import cn.com.poc.knowledge.dto.BizKnowledgeDocumentDto; import cn.com.poc.knowledge.dto.*;
import cn.com.poc.knowledge.dto.BizKnowledgeInfoDto;
import cn.com.poc.knowledge.dto.TrainKnowledgeDto;
import cn.com.poc.knowledge.dto.UpsertChunkInfoDto;
import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult; import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult;
import cn.com.yict.framemax.core.rest.BaseRest; import cn.com.yict.framemax.core.rest.BaseRest;
import cn.com.yict.framemax.data.model.PagingInfo; import cn.com.yict.framemax.data.model.PagingInfo;
...@@ -97,7 +94,7 @@ public interface KnowledgeRest extends BaseRest { ...@@ -97,7 +94,7 @@ public interface KnowledgeRest extends BaseRest {
* @param search 搜索条件 * @param search 搜索条件
* @param trainStatus 训练状态 * @param trainStatus 训练状态
*/ */
List<BizKnowledgeInfoDto> getKnowledgeList(@RequestParam(required = false) String search, @RequestParam(required = false) String trainStatus, PagingInfo pagingInfo) throws Exception; List<QueryKnowledgeDocumentDto> getKnowledgeList(@RequestParam(required = false) String search, @RequestParam(required = false) String trainStatus, PagingInfo pagingInfo) throws Exception;
/** /**
* 创建知识库 * 创建知识库
......
...@@ -7,15 +7,13 @@ import cn.com.poc.common.utils.JsonUtils; ...@@ -7,15 +7,13 @@ import cn.com.poc.common.utils.JsonUtils;
import cn.com.poc.knowledge.aggregate.KnowledgeService; import cn.com.poc.knowledge.aggregate.KnowledgeService;
import cn.com.poc.knowledge.constant.KnowledgeConstant; import cn.com.poc.knowledge.constant.KnowledgeConstant;
import cn.com.poc.knowledge.convert.BizKnowledgeInfoConvert; import cn.com.poc.knowledge.convert.BizKnowledgeInfoConvert;
import cn.com.poc.knowledge.dto.BizKnowledgeDocumentDto; import cn.com.poc.knowledge.dto.*;
import cn.com.poc.knowledge.dto.BizKnowledgeInfoDto;
import cn.com.poc.knowledge.dto.TrainKnowledgeDto;
import cn.com.poc.knowledge.dto.UpsertChunkInfoDto;
import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity; import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity;
import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity; import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
import cn.com.poc.knowledge.query.KnowledgeInfosQueryCondition; import cn.com.poc.knowledge.query.KnowledgeInfosQueryCondition;
import cn.com.poc.knowledge.query.KnowledgeInfosQueryItem; import cn.com.poc.knowledge.query.KnowledgeInfosQueryItem;
import cn.com.poc.knowledge.rest.KnowledgeRest; import cn.com.poc.knowledge.rest.KnowledgeRest;
import cn.com.poc.knowledge.service.BizKnowledgeDocumentService;
import cn.com.poc.knowledge.service.BizKnowledgeInfoService; import cn.com.poc.knowledge.service.BizKnowledgeInfoService;
import cn.com.poc.support.security.oauth.entity.UserBaseEntity; import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult; import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult;
...@@ -43,6 +41,9 @@ public class KnowledgeRestImpl implements KnowledgeRest { ...@@ -43,6 +41,9 @@ public class KnowledgeRestImpl implements KnowledgeRest {
@Resource @Resource
private BizKnowledgeInfoService bizKnowledgeInfoService; private BizKnowledgeInfoService bizKnowledgeInfoService;
@Resource
private BizKnowledgeDocumentService bizKnowledgeDocumentService;
@Override @Override
public List<BizKnowledgeDocumentDto> uploadDocument(MultipartFile[] documentFiles) throws Exception { public List<BizKnowledgeDocumentDto> uploadDocument(MultipartFile[] documentFiles) throws Exception {
Assert.notEmpty(documentFiles); Assert.notEmpty(documentFiles);
...@@ -181,8 +182,8 @@ public class KnowledgeRestImpl implements KnowledgeRest { ...@@ -181,8 +182,8 @@ public class KnowledgeRestImpl implements KnowledgeRest {
} }
@Override @Override
public List<BizKnowledgeInfoDto> getKnowledgeList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception { public List<QueryKnowledgeDocumentDto> getKnowledgeList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception {
List<BizKnowledgeInfoDto> result = new ArrayList<>(); List<QueryKnowledgeDocumentDto> result = new ArrayList<>();
UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException(); UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
KnowledgeInfosQueryCondition condition = new KnowledgeInfosQueryCondition(); KnowledgeInfosQueryCondition condition = new KnowledgeInfosQueryCondition();
condition.setMemberId(userBaseEntity.getUserId().toString()); condition.setMemberId(userBaseEntity.getUserId().toString());
...@@ -195,9 +196,16 @@ public class KnowledgeRestImpl implements KnowledgeRest { ...@@ -195,9 +196,16 @@ public class KnowledgeRestImpl implements KnowledgeRest {
List<KnowledgeInfosQueryItem> items = bizKnowledgeInfoService.knowledgeInfos(condition, pagingInfo); List<KnowledgeInfosQueryItem> items = bizKnowledgeInfoService.knowledgeInfos(condition, pagingInfo);
if (CollectionUtils.isNotEmpty(items)) { if (CollectionUtils.isNotEmpty(items)) {
result = items.stream().map(item -> { result = items.stream().map(item -> {
BizKnowledgeInfoDto dto = new BizKnowledgeInfoDto(); QueryKnowledgeDocumentDto dto = new QueryKnowledgeDocumentDto();
BeanUtil.copyProperties(item, dto); BeanUtil.copyProperties(item, dto);
dto.setDesc(item.getKnowledgeDesc()); dto.setDesc(item.getKnowledgeDesc());
List<Integer> kdIdList = JsonUtils.deSerialize(item.getKdIds(), new TypeReference<List<Integer>>() {
}.getType());
if (CollectionUtils.isNotEmpty(kdIdList)) {
List<BizKnowledgeDocumentEntity> entities = knowledgeService.getListByKdIds(kdIdList);
List<String> documentNames = entities.stream().map(BizKnowledgeDocumentEntity::getDocumentName).collect(Collectors.toList());
dto.setDocumentNames(documentNames);
}
return dto; return dto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment