Merge branch 'release' into task/temp_function_call

# Conflicts:
#	src/main/java/cn/com/poc/agent_application/aggregate/AgentApplicationInfoService.java
#	src/main/java/cn/com/poc/agent_application/aggregate/impl/AgentApplicationInfoServiceImpl.java
#	src/main/java/cn/com/poc/agent_application/convert/AgentApplicationInfoConvert.java
#	src/main/java/cn/com/poc/agent_application/rest/impl/AgentApplicationInfoRestImpl.java
#	src/main/java/cn/com/poc/expose/aggregate/impl/AgentApplicationServiceImpl.java
#	src/main/java/cn/com/poc/expose/rest/AgentApplicationRest.java
#	src/main/java/cn/com/poc/expose/rest/impl/AgentApplicationRestImpl.java

src/main/java/cn/com/poc/agent_application/aggregate/AgentApplicationInfoService.java

@@ -18,7 +18,7 @@ public interface AgentApplicationInfoService {
      * 应用预览
      */
     String callAgentApplication(String largeModel, String[] unitIds, String agentSystem,
-                                String[] knowledgeIds, Integer communicationTurn, Float topP,
+                                Integer[] knowledgeIds, Integer communicationTurn, Float topP,
                                 List<Message> messages, Boolean isLongMemory, String[] variableStructure, boolean isFunction, String[] functionName, List<String> functionConfig, String useStatus, HttpServletResponse httpServletResponse) throws Exception;
 
 

src/main/java/cn/com/poc/agent_application/aggregate/impl/AgentApplicationInfoServiceImpl.java

@@ -4,15 +4,15 @@ import cn.com.poc.agent_application.aggregate.AgentApplicationInfoService;
 import cn.com.poc.agent_application.constant.AgentApplicationConstants;
 import cn.com.poc.agent_application.constant.AgentApplicationDialoguesRecordConstants;
 import cn.com.poc.agent_application.constant.AgentApplicationGCConfigConstants;
-import cn.com.poc.agent_application.entity.BizAgentApplicationGcConfigEntity;
-import cn.com.poc.agent_application.entity.BizAgentApplicationInfoEntity;
-import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
-import cn.com.poc.agent_application.entity.CreateAgentTitleAndDescEntity;
+import cn.com.poc.agent_application.entity.*;
 import cn.com.poc.agent_application.service.BizAgentApplicationGcConfigService;
 import cn.com.poc.agent_application.service.BizAgentApplicationInfoService;
+import cn.com.poc.agent_application.service.BizAgentApplicationLargeModelListService;
 import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
 import cn.com.poc.common.utils.BlContext;
 import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity;
+import cn.com.poc.knowledge.service.BizKnowledgeDocumentService;
 import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
 import cn.com.poc.thirdparty.resource.demand.ai.aggregate.AICreateImageService;
 import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
@@ -39,7 +39,10 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Component
@@ -51,6 +54,12 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
 
     final private Logger logger = LoggerFactory.getLogger(AgentApplicationInfoService.class);
 
+    @Resource
+    private BizKnowledgeDocumentService bizKnowledgeDocumentService;
+
+    @Resource
+    private BizAgentApplicationLargeModelListService bizAgentApplicationLargeModelListService;
+
     @Resource
     private BizAgentApplicationGcConfigService bizAgentApplicationGcConfigService;
 
@@ -69,7 +78,6 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
     @Resource
     private LLMService llmService;
 
-
     @Override
     public boolean updateAndPublish(BizAgentApplicationInfoEntity bizAgentApplicationInfoEntity) throws Exception {
         UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
@@ -91,9 +99,12 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
     }
 
     @Override
-    public String callAgentApplication(String largeModel, String[] unitIds, String agentSystem, String[] knowledgeIds, Integer communicationTurn, Float topP, List<Message> messages, Boolean isLongMemory, String[] variableStructure, boolean isFunction, String[] functionName, List<String> functionConfig, String useStatus, HttpServletResponse httpServletResponse) throws Exception {
+    public String callAgentApplication(String largeModel, String[] unitIds, String agentSystem, Integer[] kdIds, Integer communicationTurn, Float topP, List<Message> messages, Boolean isLongMemory, String[] variableStructure, boolean isFunction, String[] functionName, List<String> functionConfig, String useStatus, HttpServletResponse httpServletResponse) throws Exception {
         logger.info("--------- Call Agent Application large model:{},unitIds:{},agentSystem:{},knowledgeIds:{}" + " communicationTurn:{},topP:{},messages:{}--------------", largeModel, unitIds, agentSystem, knowledgeIds, communicationTurn, topP, messages);
-        String promptTemplate = buildDialogsPrompt(messages, agentSystem, knowledgeIds);
+
+        String model = modelConvert(largeModel);
+
+        String promptTemplate = buildDialogsPrompt(messages, agentSystem, kdIds);
 
         Message[] messageArray = buildMessages(messages, communicationTurn, promptTemplate);
 
@@ -372,12 +383,20 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
         return JsonUtils.deSerialize(res.substring(start, end + 1), CreateAgentTitleAndDescEntity.class);
     }
 
-    private String buildDialogsPrompt(List<Message> messages, String agentSystem, String[] knowledgeIds) {
+    private String buildDialogsPrompt(List<Message> messages, String agentSystem, Integer[] kdIds) {
         String promptTemplate = bizAgentApplicationGcConfigService.getByConfigCode(AgentApplicationGCConfigConstants.AGENT_BASE_SYSTEM).getConfigSystem();
         promptTemplate = promptTemplate.replace("${agentSystem}", StringUtils.isNotBlank(agentSystem) ? agentSystem : StringUtils.EMPTY);
         // 调用知识库
-        if (ArrayUtils.isNotEmpty(knowledgeIds)) {
-            List<String> knowledgeResults = demandKnowledgeService.searchKnowledge(messages.get(messages.size() - 1).getContent().get(0).getText(), Arrays.stream(knowledgeIds).collect(Collectors.toList()), 10);
+        if (ArrayUtils.isNotEmpty(kdIds)) {
+            List<String> knowledgeIds = new ArrayList<>();
+            for (Integer kdId : kdIds) {
+                BizKnowledgeDocumentEntity knowledgeDocumentEntity = bizKnowledgeDocumentService.get(kdId);
+                if (null == knowledgeDocumentEntity) {
+                    continue;
+                }
+                knowledgeIds.add(knowledgeDocumentEntity.getKnowledgeId());
+            }
+            List<String> knowledgeResults = demandKnowledgeService.searchKnowledge(messages.get(messages.size() - 1).getContent().get(0).getText(), knowledgeIds, 3);
             promptTemplate = promptTemplate.replace("${knowledgeResults}", knowledgeResults.toString());
         }
         return promptTemplate;
@@ -560,4 +579,19 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
         }
         return messages.toArray(new Message[0]);
     }
+
+
+    /**
+     * 获取模型
+     *
+     * @param largeModel
+     * @return
+     */
+    private String modelConvert(String largeModel) {
+        BizAgentApplicationLargeModelListEntity largeModelEntity = bizAgentApplicationLargeModelListService.findByModelNickName(largeModel);
+        if (largeModelEntity == null) {
+            throw new BusinessException("模型不存在");
+        }
+        return largeModelEntity.getModelName();
+    }
 }

src/main/java/cn/com/poc/agent_application/convert/AgentApplicationInfoConvert.java

@@ -8,7 +8,9 @@ import cn.com.poc.agent_application.model.BizAgentApplicationInfoModel;
 import cn.com.poc.agent_application.entity.BizAgentApplicationInfoEntity;
 import cn.com.poc.agent_application.dto.AgentApplicationInfoDto;
 import cn.com.poc.agent_application.query.AgentApplicationInfoQueryItem;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.expose.dto.SearchAgentApplicationDto;
 import cn.hutool.core.util.ObjectUtil;
 import com.tencent.core.utils.JsonUtil;
 import org.apache.commons.lang3.ArrayUtils;
@@ -17,6 +19,17 @@ import org.apache.commons.lang3.StringUtils;
 
 public class AgentApplicationInfoConvert {
 
+    public static SearchAgentApplicationDto itemToSearchDto(PublishAgentApplicationQueryItem item) {
+        SearchAgentApplicationDto dto = new SearchAgentApplicationDto();
+        dto.setAgentId(item.getAgentId());
+        dto.setAgentTitle(item.getAgentTitle());
+        dto.setAgentDesc(item.getAgentDesc());
+        dto.setAgentAvatar(item.getAgentAvatar());
+        dto.setPublishedTime(item.getModifiedTime());
+        dto.setCreator(item.getNickName());
+        return dto;
+    }
+
     public static BizAgentApplicationInfoEntity modelToEntity(BizAgentApplicationInfoModel model) {
         BizAgentApplicationInfoEntity entity = new BizAgentApplicationInfoEntity();
         entity.setId(model.getId());

src/main/java/cn/com/poc/agent_application/convert/BizAgentApplicationLargeModelListConvert.java

@@ -7,20 +7,24 @@ import cn.com.poc.agent_application.dto.BizAgentApplicationLargeModelListDto;
 
 public class BizAgentApplicationLargeModelListConvert {
 
-    public static BizAgentApplicationLargeModelListEntity modelToEntity(BizAgentApplicationLargeModelListModel model){
-        BizAgentApplicationLargeModelListEntity entity = new BizAgentApplicationLargeModelListEntity();
-        entity.setId(model.getId());
-        entity.setModelName(model.getModelName());
-        entity.setOwner(model.getOwner());
-        return entity;
+    public static BizAgentApplicationLargeModelListEntity modelToEntity(BizAgentApplicationLargeModelListModel model) {
+        BizAgentApplicationLargeModelListEntity bizAgentApplicationLargeModelListEntity = new BizAgentApplicationLargeModelListEntity();
+        bizAgentApplicationLargeModelListEntity.setId(model.getId());
+        bizAgentApplicationLargeModelListEntity.setModelName(model.getModelName());
+        bizAgentApplicationLargeModelListEntity.setOwner(model.getOwner());
+        bizAgentApplicationLargeModelListEntity.setIconUrl(model.getIconUrl());
+        bizAgentApplicationLargeModelListEntity.setModelNickName(model.getModelNickName());
+        return bizAgentApplicationLargeModelListEntity;
     }
 
-    public static BizAgentApplicationLargeModelListModel entityToModel(BizAgentApplicationLargeModelListEntity entity){
-        BizAgentApplicationLargeModelListModel model = new BizAgentApplicationLargeModelListModel();
-        model.setId(entity.getId());
-        model.setModelName(entity.getModelName());
-        model.setOwner(entity.getOwner());
-        return model;
+    public static BizAgentApplicationLargeModelListModel entityToModel(BizAgentApplicationLargeModelListEntity entity) {
+        BizAgentApplicationLargeModelListModel bizAgentApplicationLargeModelListModel = new BizAgentApplicationLargeModelListModel();
+        bizAgentApplicationLargeModelListModel.setId(entity.getId());
+        bizAgentApplicationLargeModelListModel.setModelName(entity.getModelName());
+        bizAgentApplicationLargeModelListModel.setOwner(entity.getOwner());
+        bizAgentApplicationLargeModelListModel.setIconUrl(entity.getIconUrl());
+        bizAgentApplicationLargeModelListModel.setModelNickName(entity.getModelNickName());
+        return bizAgentApplicationLargeModelListModel;
     }
 
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/dto/BizAgentApplicationLargeModelListDto.java

@@ -32,4 +32,17 @@ public class BizAgentApplicationLargeModelListDto {
     public void setOwner(java.lang.String owner) {
         this.owner = owner;
     }
+
+    /**
+     * icon
+     */
+    private java.lang.String icon;
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/entity/BizAgentApplicationLargeModelListEntity.java

@@ -40,4 +40,30 @@ public class BizAgentApplicationLargeModelListEntity {
     public void setOwner(java.lang.String owner){
         this.owner = owner;
     }
+
+    /**
+     * icon_url
+     */
+    private String iconUrl;
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    /**
+     * model_nick_name
+     */
+    private String modelNickName;
+
+    public String getModelNickName() {
+        return modelNickName;
+    }
+
+    public void setModelNickName(String modelNickName) {
+        this.modelNickName = modelNickName;
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/model/BizAgentApplicationLargeModelListModel.java

 package cn.com.poc.agent_application.model;
 
 import java.io.Serializable;
+
 import cn.com.yict.framemax.data.model.BaseModelClass;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Id;
+
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 
@@ -24,53 +28,87 @@ public class BizAgentApplicationLargeModelListModel extends BaseModelClass imple
     private static final long serialVersionUID = 1L;
 
 
-    /** id
-    *
+    /**
+     * id
      */
     private java.lang.Integer id;
 
-    @Column(name = "id",length = 10)
-	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
-    public java.lang.Integer getId(){
+    @Column(name = "id", length = 10)
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public java.lang.Integer getId() {
         return this.id;
     }
 
-    public void setId(java.lang.Integer id){
+    public void setId(java.lang.Integer id) {
         this.id = id;
         super.addValidField("id");
     }
 
 
-    /** model_name
-    *模型
+    /**
+     * model_name
+     * 模型
      */
     private java.lang.String modelName;
 
-    @Column(name = "model_name",length = 100)
-    public java.lang.String getModelName(){
+    @Column(name = "model_name", length = 100)
+    public java.lang.String getModelName() {
         return this.modelName;
     }
 
-    public void setModelName(java.lang.String modelName){
+    public void setModelName(java.lang.String modelName) {
         this.modelName = modelName;
         super.addValidField("modelName");
     }
 
 
-    /** owner
-    *模型服务商
+    /**
+     * owner
+     * 模型服务商
      */
     private java.lang.String owner;
 
-    @Column(name = "owner",length = 100)
-    public java.lang.String getOwner(){
+    @Column(name = "owner", length = 100)
+    public java.lang.String getOwner() {
         return this.owner;
     }
 
-    public void setOwner(java.lang.String owner){
+    public void setOwner(java.lang.String owner) {
         this.owner = owner;
         super.addValidField("owner");
     }
 
+    /**
+     * icon_url
+     * 模型图标
+     */
+    private java.lang.String iconUrl;
+
+    @Column(name = "icon_url", length = 150)
+    public java.lang.String getIconUrl() {
+        return this.iconUrl;
+    }
+
+    public void setIconUrl(java.lang.String iconUrl) {
+        this.iconUrl = iconUrl;
+        super.addValidField("iconUrl");
+    }
+
+    /**
+     * model_nick_name
+     */
+    private java.lang.String modelNickName;
+
+    @Column(name = "model_nick_name", length = 100)
+    public java.lang.String getModelNickName() {
+        return this.modelNickName;
+    }
+
+    public void setModelNickName(java.lang.String modelNickName) {
+        this.modelNickName = modelNickName;
+        super.addValidField("modelNickName");
+    }
+
 
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/MemberDialoguesQuery.sql

+select distinct 
+    agent_id,
+    dialogs_id,
+    member_id,
+    content,
+    `timestamp`
+from
+    biz_agent_application_dialogues_record
+where is_deleted ='N'
+<< and member_id= :memberId>> 
+group by dialogs_id
+order by `timestamp` desc
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/MemberDialoguesQueryCondition.java

+package cn.com.poc.agent_application.query;   
+
+import java.io.Serializable;
+
+/**
+ * Query Condition class for MemberDialoguesQuery
+ */
+public class MemberDialoguesQueryCondition implements Serializable{
+    
+    private static final long serialVersionUID = 1L;
+    
+
+    private java.lang.Long memberId;
+    
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+        
+}
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/MemberDialoguesQueryItem.java

+package cn.com.poc.agent_application.query;	
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import cn.com.yict.framemax.data.model.BaseItemClass;
+
+/**
+ * Query Item class for MemberDialoguesQuery
+ */
+@Entity
+public class MemberDialoguesQueryItem extends BaseItemClass implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+    
+    /** agent_id
+    *agent_id
+    */ 
+    private java.lang.String agentId;
+    
+    @Column(name = "agent_id")
+    public java.lang.String getAgentId(){
+        return this.agentId;
+    }
+    
+    public void setAgentId(java.lang.String agentId){
+        this.agentId = agentId;
+    }
+    
+    /** dialogs_id
+    *dialogs_id
+    */ 
+    private java.lang.String dialogsId;
+    
+    @Column(name = "dialogs_id")
+    public java.lang.String getDialogsId(){
+        return this.dialogsId;
+    }
+    
+    public void setDialogsId(java.lang.String dialogsId){
+        this.dialogsId = dialogsId;
+    }
+    
+    /** member_id
+    *member_id
+    */ 
+    private java.lang.Long memberId;
+    
+    @Column(name = "member_id")
+    public java.lang.Long getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.Long memberId){
+        this.memberId = memberId;
+    }
+    
+    /** content
+    *content
+    */ 
+    private java.lang.String content;
+    
+    @Column(name = "content")
+    public java.lang.String getContent(){
+        return this.content;
+    }
+    
+    public void setContent(java.lang.String content){
+        this.content = content;
+    }
+    
+    /** timestamp
+    *timestamp
+    */ 
+    private java.lang.Long timestamp;
+    
+    @Column(name = "timestamp")
+    public java.lang.Long getTimestamp(){
+        return this.timestamp;
+    }
+    
+    public void setTimestamp(java.lang.Long timestamp){
+        this.timestamp = timestamp;
+    }
+    
+} 
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/PublishAgentApplicationQuery.sql

+select distinct
+    baap.id,
+    bmi.nick_name,
+    baap.agent_id,
+    baap.agent_avatar,
+    baap.agent_title,
+    baap.agent_desc,
+    baap.MODIFIED_TIME
+from
+     biz_agent_application_publish baap
+left join biz_member_info bmi on baap.member_id = bmi.member_id
+where baap.is_deleted = 'N'
+<< and LOCATE(:query,baap.agent_title) >>
+order by baap.MODIFIED_TIME desc
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/PublishAgentApplicationQueryCondition.java

+package cn.com.poc.agent_application.query;   
+
+import java.io.Serializable;
+
+/**
+ * Query Condition class for PulishAgentApplicationQuery
+ */
+public class PublishAgentApplicationQueryCondition implements Serializable{
+    
+    private static final long serialVersionUID = 1L;
+    
+
+    private java.lang.String query;
+    
+    public java.lang.String getQuery(){
+        return this.query;
+    }
+    
+    public void setQuery(java.lang.String query){
+        this.query = query;
+    }
+        
+}
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/query/PublishAgentApplicationQueryItem.java

+package cn.com.poc.agent_application.query;
+
+import cn.com.yict.framemax.data.model.BaseItemClass;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.io.Serializable;
+
+/**
+ * Query Item class for PulishAgentApplicationQuery
+ */
+@Entity
+public class PublishAgentApplicationQueryItem extends BaseItemClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     * id
+     */
+    private java.lang.Integer id;
+
+    @Column(name = "id")
+    public java.lang.Integer getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * nick_name
+     * nick_name
+     */
+    private java.lang.String nickName;
+
+    @Column(name = "nick_name")
+    public java.lang.String getNickName() {
+        return this.nickName;
+    }
+
+    public void setNickName(java.lang.String nickName) {
+        this.nickName = nickName;
+    }
+
+    /**
+     * agent_id
+     * agent_id
+     */
+    private java.lang.String agentId;
+
+    @Column(name = "agent_id")
+    public java.lang.String getAgentId() {
+        return this.agentId;
+    }
+
+    public void setAgentId(java.lang.String agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * agent_avatar
+     * agent_avatar
+     */
+    private java.lang.String agentAvatar;
+
+    @Column(name = "agent_avatar")
+    public java.lang.String getAgentAvatar() {
+        return this.agentAvatar;
+    }
+
+    public void setAgentAvatar(java.lang.String agentAvatar) {
+        this.agentAvatar = agentAvatar;
+    }
+
+    /**
+     * agent_title
+     * agent_title
+     */
+    private java.lang.String agentTitle;
+
+    @Column(name = "agent_title")
+    public java.lang.String getAgentTitle() {
+        return this.agentTitle;
+    }
+
+    public void setAgentTitle(java.lang.String agentTitle) {
+        this.agentTitle = agentTitle;
+    }
+
+    /**
+     * agent_desc
+     * agent_desc
+     */
+    private java.lang.String agentDesc;
+
+    @Column(name = "agent_desc")
+    public java.lang.String getAgentDesc() {
+        return this.agentDesc;
+    }
+
+    public void setAgentDesc(java.lang.String agentDesc) {
+        this.agentDesc = agentDesc;
+    }
+
+    /**
+     * MODIFIED_TIME
+     * MODIFIED_TIME
+     */
+    private java.util.Date modifiedTime;
+
+    @Column(name = "MODIFIED_TIME")
+    public java.util.Date getModifiedTime() {
+        return this.modifiedTime;
+    }
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+} 
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/rest/AgentApplicationInfoRest.java

@@ -56,6 +56,11 @@ public interface AgentApplicationInfoRest extends BaseRest {
      */
     List<BizAgentApplicationLargeModelListDto> getLargeModelList() throws Exception;
 
+    /**
+     * 查询模型信息
+     */
+    BizAgentApplicationLargeModelListDto getLargeModelInfo(@RequestParam String query) throws Exception;
+
 
     /**
      * 角色指令AI生成

src/main/java/cn/com/poc/agent_application/rest/impl/AgentApplicationInfoRestImpl.java

@@ -14,16 +14,25 @@ import cn.com.poc.agent_application.service.BizAgentApplicationLargeModelListSer
 import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.BlContext;
+import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.common.utils.ListUtils;
+import cn.com.poc.knowledge.aggregate.KnowledgeService;
+import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
+import cn.com.poc.knowledge.service.BizKnowledgeInfoService;
 import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
 import cn.com.yict.framemax.core.exception.BusinessException;
 import cn.com.yict.framemax.data.model.PagingInfo;
+import cn.hutool.core.collection.ListUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.plaf.ListUI;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -46,6 +55,9 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
     @Resource
     private BizAgentApplicationLargeModelListService bizAgentApplicationLargeModelListService;
 
+    @Resource
+    private KnowledgeService knowledgeService;
+
     public List<AgentApplicationInfoDto> getListByMember(AgentApplicationInfoSearchDto dto, PagingInfo pagingInfo) throws Exception {
         UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
         Long userId = userBaseEntity.getUserId();
@@ -131,8 +143,12 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
             if (infoEntity == null) {
                 throw new BusinessException("应用不存在");
             }
+            //获取知识库配置
+            List<Integer> kdIds = knowledgeService.getKdIdsByKnowledgeInfoIds(infoEntity.getKnowledgeIds());
+
+            //调用应用服务
             agentApplicationInfoService.callAgentApplication(infoEntity.getLargeModel(), infoEntity.getUnitIds()
-                    , infoEntity.getAgentSystem(), infoEntity.getKnowledgeIds(), infoEntity.getCommunicationTurn(), infoEntity.getTopP()
+                    , infoEntity.getAgentSystem(),  kdIds.toArray(new Integer[0]), infoEntity.getCommunicationTurn(), infoEntity.getTopP()
                     , dto.getMessages(), infoEntity.getIsLongMemory().equals(CommonConstant.IsDeleted.Y), infoEntity.getVariableStructure(), infoEntity.getIsFunction().equals(CommonConstant.IsDeleted.Y), infoEntity.getFunctionName(), null ,  AgentApplicationConstants.USE_AGENT_STATUS.PREVIEW,httpServletResponse);
         } catch (Exception e) {
             httpServletResponse.setContentType("text/event-stream");
@@ -146,19 +162,37 @@ public class AgentApplicationInfoRestImpl implements AgentApplicationInfoRest {
     @Override
     public List<BizAgentApplicationLargeModelListDto> getLargeModelList() throws Exception {
         List<BizAgentApplicationLargeModelListEntity> entities = bizAgentApplicationLargeModelListService.findByExample(new BizAgentApplicationLargeModelListEntity(), null);
-        Map<String, List<String>> map = entities.stream()
-                .collect(Collectors.groupingBy(BizAgentApplicationLargeModelListEntity::getOwner
-                        , Collectors.mapping(BizAgentApplicationLargeModelListEntity::getModelName, Collectors.toList())));
+        Map<String, List<BizAgentApplicationLargeModelListEntity>> map = entities.stream()
+                .collect(Collectors.groupingBy(BizAgentApplicationLargeModelListEntity::getOwner));
+
         List<BizAgentApplicationLargeModelListDto> result = new ArrayList<>();
         for (String owner : map.keySet()) {
             BizAgentApplicationLargeModelListDto dto = new BizAgentApplicationLargeModelListDto();
+            List<BizAgentApplicationLargeModelListEntity> modelListEntities = map.get(owner);
             dto.setOwner(owner);
-            dto.setModels(map.get(owner));
+            dto.setModels(modelListEntities.stream().map(BizAgentApplicationLargeModelListEntity::getModelNickName).collect(Collectors.toList()));
+            dto.setIcon(modelListEntities.get(0).getIconUrl());
             result.add(dto);
         }
         return result;
     }
 
+    @Override
+    public BizAgentApplicationLargeModelListDto getLargeModelInfo(String query) throws Exception {
+        Assert.notNull(query);
+        BizAgentApplicationLargeModelListEntity bizAgentApplicationLargeModelListEntity = new BizAgentApplicationLargeModelListEntity();
+        bizAgentApplicationLargeModelListEntity.setModelNickName(query);
+        List<BizAgentApplicationLargeModelListEntity> entities = bizAgentApplicationLargeModelListService.findByExample(bizAgentApplicationLargeModelListEntity, null);
+        if (CollectionUtils.isEmpty(entities)) {
+            throw new BusinessException("模型不存在");
+        }
+        BizAgentApplicationLargeModelListEntity entity = entities.get(0);
+        BizAgentApplicationLargeModelListDto result = new BizAgentApplicationLargeModelListDto();
+        result.setModels(ListUtil.toList(entity.getModelNickName()));
+        result.setOwner(entity.getOwner());
+        result.setIcon(entity.getIconUrl());
+        return result;
+    }
 
     @Override
     public void createAgentSystem(AgentApplicationGCDto dto, HttpServletResponse response) throws Exception {

src/main/java/cn/com/poc/agent_application/service/BizAgentApplicationDialoguesRecordService.java

 package cn.com.poc.agent_application.service;
 
+import cn.com.poc.agent_application.query.MemberDialoguesQueryItem;
 import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.poc.agent_application.entity.BizAgentApplicationDialoguesRecordEntity;
 import cn.com.yict.framemax.data.model.PagingInfo;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface BizAgentApplicationDialoguesRecordService extends BaseService {
@@ -21,4 +21,12 @@ public interface BizAgentApplicationDialoguesRecordService extends BaseService {
 
     List<BizAgentApplicationDialoguesRecordEntity> getRecord(String agentId, Integer turn);
 
+    /**
+     * 获取用户的对话【组】
+     *
+     * @param memberId 用户id
+     * @return
+     */
+    List<MemberDialoguesQueryItem> memberDialoguesQuery(Long memberId, PagingInfo pagingInfo);
+
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/service/BizAgentApplicationLargeModelListService.java

 package cn.com.poc.agent_application.service;
 
-import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.poc.agent_application.entity.BizAgentApplicationLargeModelListEntity;
+import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.yict.framemax.data.model.PagingInfo;
-import java.util.Collection;
+
 import java.util.List;
 
 public interface BizAgentApplicationLargeModelListService extends BaseService {
 
+    BizAgentApplicationLargeModelListEntity findByModelNickName(String modelNickName);
+
     BizAgentApplicationLargeModelListEntity get(java.lang.Integer id) throws Exception;
 
     List<BizAgentApplicationLargeModelListEntity> findByExample(BizAgentApplicationLargeModelListEntity example,PagingInfo pagingInfo) throws Exception;

src/main/java/cn/com/poc/agent_application/service/BizAgentApplicationPublishService.java

 package cn.com.poc.agent_application.service;
 
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryCondition;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.yict.framemax.data.model.PagingInfo;
-import java.util.Collection;
+
 import java.util.List;
 
 public interface BizAgentApplicationPublishService extends BaseService {
@@ -12,7 +14,7 @@ public interface BizAgentApplicationPublishService extends BaseService {
 
     BizAgentApplicationPublishEntity getByAgentId(String agentId) throws Exception;
 
-    List<BizAgentApplicationPublishEntity> findByExample(BizAgentApplicationPublishEntity example,PagingInfo pagingInfo) throws Exception;
+    List<BizAgentApplicationPublishEntity> findByExample(BizAgentApplicationPublishEntity example, PagingInfo pagingInfo) throws Exception;
 
     BizAgentApplicationPublishEntity save(BizAgentApplicationPublishEntity entity) throws Exception;
 
@@ -22,4 +24,5 @@ public interface BizAgentApplicationPublishService extends BaseService {
 
     void deleteByAgentId(String agentId) throws Exception;
 
+    List<PublishAgentApplicationQueryItem> query(PublishAgentApplicationQueryCondition condition, PagingInfo pagingInfo) throws Exception;
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationDialoguesRecordServiceImpl.java

 package cn.com.poc.agent_application.service.impl;	
 
+import cn.com.poc.agent_application.query.MemberDialoguesQueryCondition;
+import cn.com.poc.agent_application.query.MemberDialoguesQueryItem;
 import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
 import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
 import cn.com.poc.agent_application.model.BizAgentApplicationDialoguesRecordModel;
@@ -116,4 +118,11 @@ public class BizAgentApplicationDialoguesRecordServiceImpl extends BaseServiceIm
     public List<BizAgentApplicationDialoguesRecordEntity> getRecord(String agentId, Integer turn) {
         return null;
     }
+
+    @Override
+    public List<MemberDialoguesQueryItem> memberDialoguesQuery(Long memberId, PagingInfo pagingInfo) {
+        MemberDialoguesQueryCondition condition = new MemberDialoguesQueryCondition();
+        condition.setMemberId(memberId);
+        return this.sqlDao.query(condition, MemberDialoguesQueryItem.class,pagingInfo);
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationLargeModelListServiceImpl.java

@@ -10,10 +10,12 @@ import cn.com.yict.framemax.data.model.PagingInfo;
 import org.springframework.stereotype.Service;
 
 import org.apache.commons.collections4.CollectionUtils;
+
 import java.util.ArrayList;
 import java.util.stream.Collectors;
 import java.util.List;
 import javax.annotation.Resource;
+
 import org.springframework.util.Assert;
 
 @Service
@@ -23,30 +25,43 @@ public class BizAgentApplicationLargeModelListServiceImpl extends BaseServiceImp
     @Resource
     private BizAgentApplicationLargeModelListRepository repository;
 
-   public BizAgentApplicationLargeModelListEntity get(java.lang.Integer id) throws Exception{
+    @Override
+    public BizAgentApplicationLargeModelListEntity findByModelNickName(String modelNickName) {
+        Assert.notNull(modelNickName);
+
+        BizAgentApplicationLargeModelListModel bizAgentApplicationLargeModelListModel = new BizAgentApplicationLargeModelListModel();
+        bizAgentApplicationLargeModelListModel.setModelNickName(modelNickName);
+        List<BizAgentApplicationLargeModelListModel> models = this.repository.findByExample(bizAgentApplicationLargeModelListModel);
+        if (CollectionUtils.isNotEmpty(models)) {
+            return BizAgentApplicationLargeModelListConvert.modelToEntity(models.get(0));
+        }
+        return null;
+    }
+
+    public BizAgentApplicationLargeModelListEntity get(java.lang.Integer id) throws Exception {
         Assert.notNull(id);
         BizAgentApplicationLargeModelListModel model = this.repository.get(id);
-        if (model == null){
+        if (model == null) {
             return null;
         }
         return BizAgentApplicationLargeModelListConvert.modelToEntity(model);
     }
 
 
-   public List<BizAgentApplicationLargeModelListEntity> findByExample(BizAgentApplicationLargeModelListEntity example,PagingInfo pagingInfo) throws Exception{
+    public List<BizAgentApplicationLargeModelListEntity> findByExample(BizAgentApplicationLargeModelListEntity example, PagingInfo pagingInfo) throws Exception {
         List<BizAgentApplicationLargeModelListEntity> result = new ArrayList<BizAgentApplicationLargeModelListEntity>();
         BizAgentApplicationLargeModelListModel model = new BizAgentApplicationLargeModelListModel();
-        if (example != null){
+        if (example != null) {
             model = BizAgentApplicationLargeModelListConvert.entityToModel(example);
         }
-        List<BizAgentApplicationLargeModelListModel> models = this.repository.findByExample(model,pagingInfo);
+        List<BizAgentApplicationLargeModelListModel> models = this.repository.findByExample(model, pagingInfo);
         if (CollectionUtils.isNotEmpty(models)) {
             result = models.stream().map(BizAgentApplicationLargeModelListConvert::modelToEntity).collect(Collectors.toList());
         }
         return result;
     }
 
-    public BizAgentApplicationLargeModelListEntity save(BizAgentApplicationLargeModelListEntity entity) throws Exception{
+    public BizAgentApplicationLargeModelListEntity save(BizAgentApplicationLargeModelListEntity entity) throws Exception {
         Assert.notNull(entity);
         entity.setId(null);
         BizAgentApplicationLargeModelListModel model = BizAgentApplicationLargeModelListConvert.entityToModel(entity);
@@ -54,25 +69,25 @@ public class BizAgentApplicationLargeModelListServiceImpl extends BaseServiceImp
         return BizAgentApplicationLargeModelListConvert.modelToEntity(saveModel);
     }
 
-    public BizAgentApplicationLargeModelListEntity update(BizAgentApplicationLargeModelListEntity entity) throws Exception{
+    public BizAgentApplicationLargeModelListEntity update(BizAgentApplicationLargeModelListEntity entity) throws Exception {
         Assert.notNull(entity);
-        Assert.notNull(entity.getId(),"update pk can not be null");
+        Assert.notNull(entity.getId(), "update pk can not be null");
         BizAgentApplicationLargeModelListModel model = this.repository.get(entity.getId());
 
-       if (entity.getModelName() != null){
+        if (entity.getModelName() != null) {
             model.setModelName(entity.getModelName());
         }
-       if (entity.getOwner() != null){
+        if (entity.getOwner() != null) {
             model.setOwner(entity.getOwner());
         }
         BizAgentApplicationLargeModelListModel saveModel = this.repository.save(model);
         return BizAgentApplicationLargeModelListConvert.modelToEntity(saveModel);
     }
 
-    public void deletedById(java.lang.Integer id) throws Exception{
+    public void deletedById(java.lang.Integer id) throws Exception {
         Assert.notNull(id);
         BizAgentApplicationLargeModelListModel model = this.repository.get(id);
-        if (model != null){
+        if (model != null) {
         }
     }
 

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationPublishServiceImpl.java

 package cn.com.poc.agent_application.service.impl;
 
 import cn.com.poc.agent_application.constant.AgentApplicationConstants;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryCondition;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.com.yict.framemax.core.exception.BusinessException;
@@ -120,6 +122,11 @@ public class BizAgentApplicationPublishServiceImpl extends BaseServiceImpl
         }
     }
 
+    @Override
+    public List<PublishAgentApplicationQueryItem> query(PublishAgentApplicationQueryCondition condition, PagingInfo pagingInfo) throws Exception {
+        return this.sqlDao.query(condition, PublishAgentApplicationQueryItem.class, pagingInfo);
+    }
+
     /**
      * 参数验证和转换 Entity To Model
      *

src/main/java/cn/com/poc/common/utils/FileUtils.java

@@ -13,6 +13,21 @@ import java.util.UUID;
  */
 public class FileUtils {
 
+    /**
+     * 格式化文件大小
+     */
+    public static String formatFileSize(long bytes) {
+        if (bytes < 1024) {
+            return bytes + " B";
+        } else if (bytes < 1024 * 1024) {
+            return String.format("%.2f KB", bytes / 1024.0);
+        } else if (bytes < 1024 * 1024 * 1024) {
+            return String.format("%.2f MB", bytes / (1024.0 * 1024));
+        } else {
+            return String.format("%.2f GB", bytes / (1024.0 * 1024 * 1024));
+        }
+    }
+
     public static File multipartFileToFile(MultipartFile multiFile) {
 
         // 获取文件名
@@ -36,7 +51,7 @@ public class FileUtils {
      * @param data
      * @throws Exception
      */
-    public static File createTempFile(byte[] data,String fileSuffix) throws IOException {
+    public static File createTempFile(byte[] data, String fileSuffix) throws IOException {
         if (data != null) {
             File file = File.createTempFile(UUID.randomUUID().toString(), fileSuffix);
             if (file.exists()) {

src/main/java/cn/com/poc/expose/aggregate/impl/AgentApplicationServiceImpl.java

@@ -14,6 +14,11 @@ import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.BlContext;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.com.poc.expose.aggregate.AgentApplicationService;
+import cn.com.poc.expose.dto.AgentApplicationDto;
+import cn.com.poc.expose.rest.AgentApplicationRest;
+import cn.com.poc.knowledge.aggregate.KnowledgeService;
+import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
+import cn.com.poc.knowledge.service.BizKnowledgeInfoService;
 import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
 import cn.com.poc.thirdparty.resource.demand.ai.common.domain.Message;
 import cn.com.poc.thirdparty.resource.demand.ai.common.domain.MultiContent;
@@ -23,6 +28,7 @@ import cn.com.poc.thirdparty.service.LLMService;
 import cn.com.yict.framemax.core.exception.BusinessException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +44,10 @@ import java.util.List;
 public class AgentApplicationServiceImpl implements AgentApplicationService {
 
     final private Logger logger = LoggerFactory.getLogger(AgentApplicationService.class);
+
+    @Resource
+    private KnowledgeService knowledgeService;
+
     @Resource
     private BizAgentApplicationPublishService bizAgentApplicationPublishService;
 
@@ -71,19 +81,16 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
             throw new BusinessException("未找到应用");
         }
 
-        //todo 这个agent 会开启那些 function
-
-        //todo 假设 1. 【变量】
-
-        //todo [变量] function_name    , function_name
+        //获取知识库配置
+        List<Integer> kdIdList = knowledgeService.getKdIdsByKnowledgeInfoIds(infoEntity.getKnowledgeIds());
 
         // 构造对话参数
         List<Message> messages = new ArrayList<>();
         buildMessages(dialogsId, agentId, userBaseEntity.getUserId(), messages, input);
 
-        // function_name -- List<>
+
         String output = agentApplicationInfoService.callAgentApplication(infoEntity.getLargeModel(), infoEntity.getUnitIds()
-                , infoEntity.getAgentSystem(), infoEntity.getKnowledgeIds(), infoEntity.getCommunicationTurn(), infoEntity.getTopP()
+                , infoEntity.getAgentSystem(), kdIdList.toArray(new Integer[0]), infoEntity.getCommunicationTurn(), infoEntity.getTopP()
                 , messages, infoEntity.getIsLongMemory().equals(CommonConstant.IsDeleted.Y), infoEntity.getVariableStructure(), infoEntity.getIsFunction().equals(CommonConstant.IsDeleted.Y), infoEntity.getFunctionName(), null, AgentApplicationConstants.USE_AGENT_STATUS.PUBLISH, httpServletResponse);
 
 

src/main/java/cn/com/poc/expose/dto/DialoguesContextDto.java

+package cn.com.poc.expose.dto;
+
+import java.io.Serializable;
+
+public class DialoguesContextDto implements Serializable {
+
+
+    /** role
+     *角色 user-用户  assistant-助手
+     */
+    private java.lang.String role;
+
+    public java.lang.String getRole(){
+        return this.role;
+    }
+
+    public void setRole(java.lang.String role){
+        this.role = role;
+    }
+    /** agent_id
+     *agent应用ID
+     */
+    private java.lang.String agentId;
+
+    public java.lang.String getAgentId(){
+        return this.agentId;
+    }
+
+    public void setAgentId(java.lang.String agentId){
+        this.agentId = agentId;
+    }
+
+    /** content
+     *内容
+     */
+    private java.lang.String content;
+
+    public java.lang.String getContent(){
+        return this.content;
+    }
+
+    public void setContent(java.lang.String content){
+        this.content = content;
+    }
+
+
+    /** timestamp
+     *时间戳
+     */
+    private java.lang.Long timestamp;
+
+    public java.lang.Long getTimestamp(){
+        return this.timestamp;
+    }
+
+    public void setTimestamp(java.lang.Long timestamp){
+        this.timestamp = timestamp;
+    }
+
+}

src/main/java/cn/com/poc/expose/dto/SearchAgentApplicationDto.java

+package cn.com.poc.expose.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class SearchAgentApplicationDto implements Serializable {
+
+    /**
+     * 应用id
+     */
+    private String agentId;
+
+    /**
+     * 应用名称
+     */
+    private String agentTitle;
+
+    /**
+     * 应用描述
+     */
+    private String agentDesc;
+
+    /**
+     * 应用头像
+     */
+    private String agentAvatar;
+
+    /**
+     *  发布时间
+     */
+    private Date publishedTime;
+
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentTitle() {
+        return agentTitle;
+    }
+
+    public void setAgentTitle(String agentTitle) {
+        this.agentTitle = agentTitle;
+    }
+
+    public String getAgentDesc() {
+        return agentDesc;
+    }
+
+    public void setAgentDesc(String agentDesc) {
+        this.agentDesc = agentDesc;
+    }
+
+    public String getAgentAvatar() {
+        return agentAvatar;
+    }
+
+    public void setAgentAvatar(String agentAvatar) {
+        this.agentAvatar = agentAvatar;
+    }
+
+    public Date getPublishedTime() {
+        return publishedTime;
+    }
+
+    public void setPublishedTime(Date publishedTime) {
+        this.publishedTime = publishedTime;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+}

src/main/java/cn/com/poc/expose/dto/UserDialoguesDto.java

+package cn.com.poc.expose.dto;
+
+import java.io.Serializable;
+
+public class UserDialoguesDto implements Serializable {
+
+    /**
+     * 会话ID
+     */
+    private java.lang.String dialogsId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+
+    public String getDialogsId() {
+        return dialogsId;
+    }
+
+    public void setDialogsId(String dialogsId) {
+        this.dialogsId = dialogsId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

src/main/java/cn/com/poc/expose/rest/AgentApplicationRest.java

 package cn.com.poc.expose.rest;
 
 import cn.com.poc.agent_application.dto.AgentApplicationCreateContinueQuesDto;
+import cn.com.poc.agent_application.dto.AgentApplicationInfoDto;
 import cn.com.poc.agent_application.dto.AgentApplicationInfoSearchDto;
 import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto;
 import cn.com.poc.expose.dto.AgentApplicationDto;
+import cn.com.poc.expose.dto.DialoguesContextDto;
+import cn.com.poc.expose.dto.SearchAgentApplicationDto;
+import cn.com.poc.expose.dto.UserDialoguesDto;
 import cn.com.yict.framemax.core.rest.BaseRest;
+import cn.com.yict.framemax.data.model.PagingInfo;
 import cn.com.yict.framemax.web.permission.Access;
 import cn.com.yict.framemax.web.permission.Permission;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +24,7 @@ public interface AgentApplicationRest extends BaseRest {
     /**
      * 创建对话
      */
-    String createDialogues();
+    String createDialogues(@RequestParam String agentId) throws Exception;
 
     /**
      * 调用 已发布Agent应用
@@ -27,12 +32,13 @@ public interface AgentApplicationRest extends BaseRest {
     void callAgentApplication(@RequestBody AgentApplicationDto dto, HttpServletResponse httpServletResponse) throws Exception;
 
     /**
-     * 获取 已发布Agent应用
+     * 获取 已发布Agent应用列表
      */
-    List<BizAgentApplicationPublishDto> getAgentApplication(@RequestBody AgentApplicationInfoSearchDto dto, HttpServletResponse httpServletResponse) throws Exception;
+    @Permission(value = Access.Anonymous)
+    List<SearchAgentApplicationDto> agentApplicationList(@RequestBody AgentApplicationInfoSearchDto dto, PagingInfo pagingInfo) throws Exception;
 
     /**
-     * 获取应用详情
+     * 获取 已发布应用详情
      */
     @Permission(value = Access.Anonymous)
     BizAgentApplicationPublishDto getInfo(@RequestParam String agentId) throws Exception;
@@ -42,4 +48,19 @@ public interface AgentApplicationRest extends BaseRest {
      */
     List<String> createContinueQuestions(@RequestBody AgentApplicationCreateContinueQuesDto dto) throws Exception;
 
+    /**
+     * 获取用户已创建的对话记录
+     */
+    List<UserDialoguesDto> getUserDialogues() throws Exception;
+
+    /**
+     * 关闭对话
+     */
+    void closeDialogues(@RequestParam String dialogueId) throws Exception;
+
+    /**
+     * 获取对话上下文
+     */
+    List<DialoguesContextDto> getDialogueContext(@RequestParam String dialogueId) throws Exception;
+
 }

src/main/java/cn/com/poc/expose/rest/impl/AgentApplicationRestImpl.java

 package cn.com.poc.expose.rest.impl;
 
+import cn.com.poc.agent_application.convert.AgentApplicationInfoConvert;
+import cn.com.poc.agent_application.convert.BizAgentApplicationDialoguesRecordConvert;
 import cn.com.poc.agent_application.convert.BizAgentApplicationPublishConvert;
 import cn.com.poc.agent_application.dto.AgentApplicationCreateContinueQuesDto;
 import cn.com.poc.agent_application.dto.AgentApplicationInfoSearchDto;
+import cn.com.poc.agent_application.dto.BizAgentApplicationDialoguesRecordDto;
 import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto;
+import cn.com.poc.agent_application.entity.BizAgentApplicationDialoguesRecordEntity;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
+import cn.com.poc.agent_application.query.MemberDialoguesQueryItem;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryCondition;
+import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
+import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
 import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
+import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.Assert;
+import cn.com.poc.common.utils.BlContext;
+import cn.com.poc.common.utils.StringUtils;
 import cn.com.poc.common.utils.UUIDTool;
 import cn.com.poc.expose.aggregate.AgentApplicationService;
 import cn.com.poc.expose.dto.AgentApplicationDto;
+import cn.com.poc.expose.dto.DialoguesContextDto;
+import cn.com.poc.expose.dto.SearchAgentApplicationDto;
+import cn.com.poc.expose.dto.UserDialoguesDto;
 import cn.com.poc.expose.rest.AgentApplicationRest;
+import cn.com.poc.support.security.oauth.entity.UserBaseEntity;
 import cn.com.yict.framemax.core.exception.BusinessException;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 public class AgentApplicationRestImpl implements AgentApplicationRest {
@@ -30,8 +49,11 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
     @Resource
     private BizAgentApplicationPublishService bizAgentApplicationPublishService;
 
+    @Resource
+    private BizAgentApplicationDialoguesRecordService bizAgentApplicationDialoguesRecordService;
+
     @Override
-    public String createDialogues()  {
+    public String createDialogues(String agentId) {
         return "DIA_" + UUIDTool.getUUID();
     }
 
@@ -53,8 +75,17 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
     }
 
     @Override
-    public List<BizAgentApplicationPublishDto> getAgentApplication(AgentApplicationInfoSearchDto dto, HttpServletResponse httpServletResponse) throws Exception {
-        return null;
+    public List<SearchAgentApplicationDto> agentApplicationList(AgentApplicationInfoSearchDto dto, PagingInfo pagingInfo) throws Exception {
+        PublishAgentApplicationQueryCondition condition = new PublishAgentApplicationQueryCondition();
+        if (StringUtils.isNotBlank(dto.getQuery())) {
+            condition.setQuery(dto.getQuery());
+        }
+        List<SearchAgentApplicationDto> result = new ArrayList<>();
+        List<PublishAgentApplicationQueryItem> items = bizAgentApplicationPublishService.query(condition, pagingInfo);
+        if (CollectionUtils.isNotEmpty(items)) {
+            result = items.stream().map(AgentApplicationInfoConvert::itemToSearchDto).collect(Collectors.toList());
+        }
+        return result;
     }
 
     @Override
@@ -72,4 +103,59 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
         cn.com.poc.common.utils.Assert.notNull(dto.getInput(), "input不能为空");
         return agentApplicationService.createContinueQuestions(dto.getInput());
     }
+
+    @Override
+    public List<UserDialoguesDto> getUserDialogues() throws Exception {
+        UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
+        if (userBaseEntity == null) {
+            throw new BusinessException("用户未登录");
+        }
+        Long userId = userBaseEntity.getUserId();
+        List<UserDialoguesDto> result = new ArrayList<>();
+        List<MemberDialoguesQueryItem> memberDialoguesQueryItems = bizAgentApplicationDialoguesRecordService.memberDialoguesQuery(userId, null);
+        if (CollectionUtils.isNotEmpty(memberDialoguesQueryItems)) {
+            result = memberDialoguesQueryItems.stream().map(item -> {
+                UserDialoguesDto userDialoguesDto = new UserDialoguesDto();
+                userDialoguesDto.setDialogsId(item.getDialogsId());
+                userDialoguesDto.setContent(item.getContent());
+                return userDialoguesDto;
+            }).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    @Override
+    public void closeDialogues(String dialogueId) throws Exception {
+        Assert.notBlank(dialogueId, "对话ID不能为空");
+        BizAgentApplicationDialoguesRecordEntity recordEntity = new BizAgentApplicationDialoguesRecordEntity();
+        recordEntity.setDialogsId(dialogueId);
+        recordEntity.setIsDeleted(CommonConstant.IsDeleted.N);
+        List<BizAgentApplicationDialoguesRecordEntity> entities = bizAgentApplicationDialoguesRecordService.findByExample(recordEntity, null);
+        if (CollectionUtils.isNotEmpty(entities)) {
+            for (BizAgentApplicationDialoguesRecordEntity entity : entities) {
+                bizAgentApplicationDialoguesRecordService.deletedById(entity.getId());
+            }
+        }
+    }
+
+    @Override
+    public List<DialoguesContextDto> getDialogueContext(String dialogueId) throws Exception {
+        Assert.notBlank(dialogueId, "对话ID不能为空");
+        BizAgentApplicationDialoguesRecordEntity recordEntity = new BizAgentApplicationDialoguesRecordEntity();
+        recordEntity.setDialogsId(dialogueId);
+        recordEntity.setIsDeleted(CommonConstant.IsDeleted.N);
+        List<BizAgentApplicationDialoguesRecordEntity> entities = bizAgentApplicationDialoguesRecordService.findByExample(recordEntity, null);
+        if (CollectionUtils.isNotEmpty(entities)) {
+            return entities.stream().map(value -> {
+                        DialoguesContextDto dto = new DialoguesContextDto();
+                        dto.setRole(value.getRole());
+                        dto.setAgentId(value.getAgentId());
+                        dto.setContent(value.getContent());
+                        dto.setTimestamp(value.getTimestamp());
+                        return dto;
+                    }
+            ).collect(Collectors.toList());
+        }
+        return null;
+    }
 }

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

 package cn.com.poc.knowledge.aggregate;
 
 import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
 import cn.com.yict.framemax.data.model.PagingInfo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -19,10 +21,11 @@ public interface KnowledgeService {
     /**
      * 删除文档
      *
-     * @param kdId 主键ID
+     * @param knowledgeInfoId 知识库ID
+     * @param kdId            文档ID
      * @return 是否成功
      */
-    Boolean delDocument(Integer kdId);
+    Boolean delDocument(Integer knowledgeInfoId, Integer kdId);
 
 
     /**
@@ -42,17 +45,64 @@ public interface KnowledgeService {
     /**
      * 开启训练
      */
-    Boolean trainKnowledge(List<Integer> kdId) throws Exception;
+    Boolean trainKnowledge(Integer knowledgeInfoId, List<Integer> kdId, SegmentationConfigRequest segmentationConfig) throws Exception;
 
     /**
      * 获取用户知识库
      */
-    List<BizKnowledgeDocumentEntity> getList(String search, String trainStatus, PagingInfo pagingInfo) throws Exception;
+    List<BizKnowledgeDocumentEntity> searchDocuments(String search, String trainStatus, List<Integer> kdIds, String memberId, PagingInfo pagingInfo);
 
     /**
-     * 获取用户知识库
+     * 获取用户知识库文档
      */
     List<BizKnowledgeDocumentEntity> getListByKdIds(List<Integer> kdIds);
 
 
+    /**
+     * 获取知识库分片
+     */
+    GetKnowledgeChunkInfoResult getChunkInfo(List<Integer> kdIds, PagingInfo pagingInfo);
+
+    /**
+     * 开关知识库分片
+     *
+     * @param kdId            知识库id
+     * @param chunkRelationId 分片关系id
+     * @param isOpen          是否开启 Y/N
+     */
+    void openKnowledgeChunk(Integer kdId, String chunkRelationId, String isOpen);
+
+    /**
+     * 删除知识库分片
+     *
+     * @param kdId            知识库id
+     * @param chunkRelationId 分片关系id
+     */
+    void deleteKnowledgeChunk(Integer kdId, String chunkRelationId);
+
+    /**
+     * 更新知识库分片内容
+     *
+     * @param kdId            知识库id
+     * @param chunkRelationId 分片关系id
+     * @param content         分片内容
+     */
+    void updateKnowledgeChunkDoc(Integer kdId, String chunkRelationId, String content);
+
+    /**
+     * 新增知识库分片
+     *
+     * @param kdId      知识库id
+     * @param content   分片内容
+     * @param chunkSort 分片排序
+     */
+    void addKnowledgeChunk(Integer kdId, String content, Integer chunkSort);
+
+    /**
+     * 获取知识库文档ID列表
+     *
+     * @param knowledgeInfoIds 知识库信息ID列表
+     */
+    List<Integer> getKdIdsByKnowledgeInfoIds(String[] knowledgeInfoIds) throws Exception;
+
 }

src/main/java/cn/com/poc/knowledge/convert/BizKnowledgeInfoConvert.java

+package cn.com.poc.knowledge.convert;
+
+import cn.com.poc.knowledge.model.BizKnowledgeInfoModel;
+import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
+import cn.com.poc.knowledge.dto.BizKnowledgeInfoDto;
+
+
+public class BizKnowledgeInfoConvert {
+
+    public static BizKnowledgeInfoEntity modelToEntity(BizKnowledgeInfoModel model) {
+        BizKnowledgeInfoEntity entity = new BizKnowledgeInfoEntity();
+        entity.setId(model.getId());
+        entity.setKnowledgeName(model.getKnowledgeName());
+        entity.setMemberId(model.getMemberId());
+        entity.setKdIds(model.getKdIds());
+        entity.setTrainStatus(model.getTrainStatus());
+        entity.setKnowledgeDesc(model.getKnowledgeDesc());
+        entity.setIsOpen(model.getIsOpen());
+        entity.setIsDeleted(model.getIsDeleted());
+        entity.setCreator(model.getCreator());
+        entity.setCreatedTime(model.getCreatedTime());
+        entity.setModifier(model.getModifier());
+        entity.setModifiedTime(model.getModifiedTime());
+        entity.setSysVersion(model.getSysVersion());
+        return entity;
+    }
+
+    public static BizKnowledgeInfoModel entityToModel(BizKnowledgeInfoEntity entity) {
+        BizKnowledgeInfoModel model = new BizKnowledgeInfoModel();
+        model.setId(entity.getId());
+        model.setKnowledgeName(entity.getKnowledgeName());
+        model.setMemberId(entity.getMemberId());
+        model.setKdIds(entity.getKdIds());
+        model.setTrainStatus(entity.getTrainStatus());
+        model.setKnowledgeDesc(entity.getKnowledgeDesc());
+        model.setIsOpen(entity.getIsOpen());
+        model.setIsDeleted(entity.getIsDeleted());
+        model.setCreator(entity.getCreator());
+        model.setCreatedTime(entity.getCreatedTime());
+        model.setModifier(entity.getModifier());
+        model.setModifiedTime(entity.getModifiedTime());
+        model.setSysVersion(entity.getSysVersion());
+        return model;
+    }
+
+    public static BizKnowledgeInfoDto entityToDto(BizKnowledgeInfoEntity entity) {
+        BizKnowledgeInfoDto dto = new BizKnowledgeInfoDto();
+        dto.setId(entity.getId());
+        dto.setKnowledgeName(entity.getKnowledgeName());
+        dto.setMemberId(entity.getMemberId());
+        dto.setIsOpen(entity.getIsOpen());
+        dto.setKdIds(entity.getKdIds());
+        dto.setTrainStatus(entity.getTrainStatus());
+        dto.setDesc(entity.getKnowledgeDesc());
+        dto.setModifiedTime(entity.getModifiedTime());
+        return dto;
+    }
+
+    public static BizKnowledgeInfoEntity dtoToEntity(BizKnowledgeInfoDto dto) {
+        BizKnowledgeInfoEntity entity = new BizKnowledgeInfoEntity();
+        entity.setId(dto.getId());
+        entity.setKnowledgeName(dto.getKnowledgeName());
+        entity.setMemberId(dto.getMemberId());
+        entity.setKdIds(dto.getKdIds());
+        entity.setIsOpen(dto.getIsOpen());
+        entity.setTrainStatus(dto.getTrainStatus());
+        entity.setKnowledgeDesc(dto.getDesc());
+        return entity;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/convert/KnowledgeDocumentConvert.java

 package cn.com.poc.knowledge.convert;
 
+import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.common.utils.StringUtils;
 import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity;
 import cn.com.poc.knowledge.model.BizKnowledgeDocumentModel;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
 
 public class KnowledgeDocumentConvert {
 
@@ -16,7 +19,12 @@ public class KnowledgeDocumentConvert {
         bizKnowledgeDocumentEntity.setCharCount(model.getCharCount());
         bizKnowledgeDocumentEntity.setUploadTime(model.getUploadTime());
         bizKnowledgeDocumentEntity.setIsEnable(model.getIsEnable());
+        if (StringUtils.isNotBlank(model.getSegmentationConfig())) {
+            SegmentationConfigRequest segmentationConfigRequest = JsonUtils.deSerialize(model.getSegmentationConfig(), SegmentationConfigRequest.class);
+            bizKnowledgeDocumentEntity.setSegmentationConfig(segmentationConfigRequest);
+        }
         bizKnowledgeDocumentEntity.setKnowledgeId(model.getKnowledgeId());
+        bizKnowledgeDocumentEntity.setDocumentSize(model.getDocumentSize());
         bizKnowledgeDocumentEntity.setTrainStatus(model.getTrainStatus());
         bizKnowledgeDocumentEntity.setIsDeleted(model.getIsDeleted());
         bizKnowledgeDocumentEntity.setCreator(model.getCreator());
@@ -36,7 +44,9 @@ public class KnowledgeDocumentConvert {
         bizKnowledgeDocumentModel.setDocumentUrl(entity.getDocumentUrl());
         bizKnowledgeDocumentModel.setCharCount(entity.getCharCount());
         bizKnowledgeDocumentModel.setUploadTime(entity.getUploadTime());
+        bizKnowledgeDocumentModel.setDocumentSize(entity.getDocumentSize());
         bizKnowledgeDocumentModel.setIsEnable(entity.getIsEnable());
+        bizKnowledgeDocumentModel.setSegmentationConfig(JsonUtils.serialize(entity.getSegmentationConfig()));
         bizKnowledgeDocumentModel.setKnowledgeId(entity.getKnowledgeId());
         bizKnowledgeDocumentModel.setTrainStatus(entity.getTrainStatus());
         bizKnowledgeDocumentModel.setIsDeleted(entity.getIsDeleted());

src/main/java/cn/com/poc/knowledge/dto/BizKnowledgeDocumentDto.java

 package cn.com.poc.knowledge.dto;
 
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
+
 /**
  * Model class for biz_knowledge_document
  * 知识库文件表
@@ -7,9 +9,9 @@ package cn.com.poc.knowledge.dto;
 public class BizKnowledgeDocumentDto {
 
 
-  
-    /** kd_id
-    *主键
+    /**
+     * kd_id
+     * 主键
      */
     private Integer kdId;
 
@@ -21,130 +23,162 @@ public class BizKnowledgeDocumentDto {
         this.kdId = kdId;
     }
 
-    /** owner
-    *拥有者：System-系统 、User-用户
+    /**
+     * owner
+     * 拥有者：System-系统 、User-用户
      */
     private String owner;
 
-    public String getOwner(){
+    public String getOwner() {
         return this.owner;
     }
 
-    public void setOwner(String owner){
+    public void setOwner(String owner) {
         this.owner = owner;
     }
 
 
-    /** knowledge_type
-    *知识库类型   QA-问答、Base-基础
+    /**
+     * knowledge_type
+     * 知识库类型   QA-问答、Base-基础
      */
     private String knowledgeType;
 
-    public String getKnowledgeType(){
+    public String getKnowledgeType() {
         return this.knowledgeType;
     }
 
-    public void setKnowledgeType(String knowledgeType){
+    public void setKnowledgeType(String knowledgeType) {
         this.knowledgeType = knowledgeType;
     }
 
 
-    /** document_name
-    *文档名
+    /**
+     * document_name
+     * 文档名
      */
     private String documentName;
 
-    public String getDocumentName(){
+    public String getDocumentName() {
         return this.documentName;
     }
 
-    public void setDocumentName(String documentName){
+    public void setDocumentName(String documentName) {
         this.documentName = documentName;
     }
 
 
-    /** document_url
-    *文件下载地址
+    /**
+     * document_url
+     * 文件下载地址
      */
     private String documentUrl;
 
-    public String getDocumentUrl(){
+    public String getDocumentUrl() {
         return this.documentUrl;
     }
 
-    public void setDocumentUrl(String documentUrl){
+    public void setDocumentUrl(String documentUrl) {
         this.documentUrl = documentUrl;
     }
 
+    /**
+     * documentSize
+     */
+    private String documentSize;
+
+    public String getDocumentSize() {
+        return documentSize;
+    }
 
-    /** char_count
-    *文档字符数
+    public void setDocumentSize(String documentSize) {
+        this.documentSize = documentSize;
+    }
+
+    /**
+     * char_count
+     * 文档字符数
      */
     private Long charCount;
 
-    public Long getCharCount(){
+    public Long getCharCount() {
         return this.charCount;
     }
 
-    public void setCharCount(Long charCount){
+    public void setCharCount(Long charCount) {
         this.charCount = charCount;
     }
 
 
-    /** upload_time
-    *上传时间
+    /**
+     * upload_time
+     * 上传时间
      */
     private java.util.Date uploadTime;
 
-    public java.util.Date getUploadTime(){
+    public java.util.Date getUploadTime() {
         return this.uploadTime;
     }
 
-    public void setUploadTime(java.util.Date uploadTime){
+    public void setUploadTime(java.util.Date uploadTime) {
         this.uploadTime = uploadTime;
     }
 
 
-    /** is_enable
-    *是否启用 N-不启用 Y-启用
+    /**
+     * is_enable
+     * 是否启用 N-不启用 Y-启用
      */
     private String isEnable;
 
-    public String getIsEnable(){
+    public String getIsEnable() {
         return this.isEnable;
     }
 
-    public void setIsEnable(String isEnable){
+    public void setIsEnable(String isEnable) {
         this.isEnable = isEnable;
     }
 
 
-    /** knowledge_id
-    *中台知识库ID
+    /**
+     * knowledge_id
+     * 中台知识库ID
      */
     private String knowledgeId;
 
-    public String getKnowledgeId(){
+    public String getKnowledgeId() {
         return this.knowledgeId;
     }
 
-    public void setKnowledgeId(String knowledgeId){
+    public void setKnowledgeId(String knowledgeId) {
         this.knowledgeId = knowledgeId;
     }
 
 
-    /** train_status
-    *状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
+    /**
+     * train_status
+     * 状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
      */
     private String trainStatus;
 
-    public String getTrainStatus(){
+    public String getTrainStatus() {
         return this.trainStatus;
     }
 
-    public void setTrainStatus(String trainStatus){
+    public void setTrainStatus(String trainStatus) {
         this.trainStatus = trainStatus;
     }
 
+    /**
+     * 分片规则
+     */
+    private SegmentationConfigRequest segmentationConfig;
 
+    public SegmentationConfigRequest getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(SegmentationConfigRequest segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/dto/BizKnowledgeInfoDto.java

+package cn.com.poc.knowledge.dto;
+
+
+import javax.persistence.Column;
+
+public class BizKnowledgeInfoDto {
+
+    /**
+     * id
+     */
+    private java.lang.Integer id;
+
+    public java.lang.Integer getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * knowledge_name
+     * 知识库名字
+     */
+    private java.lang.String knowledgeName;
+
+    public java.lang.String getKnowledgeName() {
+        return this.knowledgeName;
+    }
+
+    public void setKnowledgeName(java.lang.String knowledgeName) {
+        this.knowledgeName = knowledgeName;
+    }
+
+    /**
+     * member_id
+     * 用户ID
+     */
+    private java.lang.String memberId;
+
+    public java.lang.String getMemberId() {
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.String memberId) {
+        this.memberId = memberId;
+    }
+
+    /**
+     * kd_ids
+     * 关联的文件ID
+     */
+    private java.lang.String kdIds;
+
+    public java.lang.String getKdIds() {
+        return this.kdIds;
+    }
+
+    public void setKdIds(java.lang.String kdIds) {
+        this.kdIds = kdIds;
+    }
+
+    /**
+     * train_status
+     * 状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
+     */
+    private java.lang.String trainStatus;
+
+    public java.lang.String getTrainStatus() {
+        return this.trainStatus;
+    }
+
+    public void setTrainStatus(java.lang.String trainStatus) {
+        this.trainStatus = trainStatus;
+    }
+
+    /**
+     * desc
+     */
+    private java.lang.String desc;
+
+    public java.lang.String getDesc() {
+        return this.desc;
+    }
+
+    public void setDesc(java.lang.String desc) {
+        this.desc = desc;
+    }
+
+    /**
+     * isOpen
+     */
+    private java.lang.String isOpen;
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    /**
+     * MODIFIED_TIME
+     * MODIFIED_TIME
+     */
+    private java.util.Date modifiedTime;
+
+    @Column(name = "MODIFIED_TIME")
+    public java.util.Date getModifiedTime() {
+        return this.modifiedTime;
+    }
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+}
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/dto/TrainKnowledgeDto.java

+package cn.com.poc.knowledge.dto;
+
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class TrainKnowledgeDto implements Serializable {
+
+    private Integer knowledgeInfoId;
+
+    private List<Integer> kdIds;
+
+    private SegmentationConfigRequest segmentationConfig;
+
+    public Integer getKnowledgeInfoId() {
+        return knowledgeInfoId;
+    }
+
+    public void setKnowledgeInfoId(Integer knowledgeInfoId) {
+        this.knowledgeInfoId = knowledgeInfoId;
+    }
+
+    public List<Integer> getKdIds() {
+        return kdIds;
+    }
+
+    public void setKdIds(List<Integer> kdIds) {
+        this.kdIds = kdIds;
+    }
+
+    public SegmentationConfigRequest getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(SegmentationConfigRequest segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+    }
+}

src/main/java/cn/com/poc/knowledge/dto/UpsertChunkInfoDto.java

+package cn.com.poc.knowledge.dto;
+
+import cn.com.poc.support.dgTools.request.AbstractRequest;
+import cn.com.poc.support.dgTools.result.AbstractResult;
+
+import java.io.Serializable;
+
+public class UpsertChunkInfoDto extends AbstractRequest<AbstractResult> implements Serializable {
+
+    /**
+     * 知识库ID
+     */
+    private Integer kdId;
+
+    /**
+     * 大小块关联ID
+     */
+    private String chunkRelationId;
+
+    /**
+     * 分片内容
+     */
+    private String chunkContent;
+
+    /**
+     * 分片是否开启
+     */
+    private String isOpen;
+
+    /**
+     * 分片排序
+     */
+    private Integer chunkSort;
+
+
+    public Integer getKdId() {
+        return kdId;
+    }
+
+    public void setKdId(Integer kdId) {
+        this.kdId = kdId;
+    }
+
+    public String getChunkRelationId() {
+        return chunkRelationId;
+    }
+
+    public void setChunkRelationId(String chunkRelationId) {
+        this.chunkRelationId = chunkRelationId;
+    }
+
+    public String getChunkContent() {
+        return chunkContent;
+    }
+
+    public void setChunkContent(String chunkContent) {
+        this.chunkContent = chunkContent;
+    }
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    public Integer getChunkSort() {
+        return chunkSort;
+    }
+
+    public void setChunkSort(Integer chunkSort) {
+        this.chunkSort = chunkSort;
+    }
+
+    @Override
+    public String getMethod() throws Exception {
+        return null;
+    }
+}

src/main/java/cn/com/poc/knowledge/entity/BizKnowledgeDocumentEntity.java

 package cn.com.poc.knowledge.entity;
 
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
+
+import javax.persistence.Column;
+
 /**
  * Model class for biz_knowledge_document
  * 知识库文件表
@@ -147,6 +151,32 @@ public class BizKnowledgeDocumentEntity{
     }
 
 
+    /**
+     * 文档大小【单位：字节】
+     */
+    private Long documentSize;
+
+    public Long getDocumentSize() {
+        return documentSize;
+    }
+
+    public void setDocumentSize(Long documentSize) {
+        this.documentSize = documentSize;
+    }
+
+    /**
+     * 分片规则
+     */
+    private SegmentationConfigRequest segmentationConfig;
+
+    public SegmentationConfigRequest getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(SegmentationConfigRequest segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+    }
+
     /** is_deleted
     *是否删除 Y 是  N 否
     */ 

src/main/java/cn/com/poc/knowledge/entity/BizKnowledgeInfoEntity.java

+package cn.com.poc.knowledge.entity;	
+
+
+public class BizKnowledgeInfoEntity {
+
+    private static final long serialVersionUID = 1L;
+	/** id
+    *
+    */ 
+    private java.lang.Integer id;
+
+    public java.lang.Integer getId(){
+        return this.id;
+    }
+    
+    public void setId(java.lang.Integer id){
+        this.id = id;
+    }
+	/** knowledge_name
+    *知识库名字
+    */ 
+    private java.lang.String knowledgeName;
+
+    public java.lang.String getKnowledgeName(){
+        return this.knowledgeName;
+    }
+    
+    public void setKnowledgeName(java.lang.String knowledgeName){
+        this.knowledgeName = knowledgeName;
+    }
+	/** member_id
+    *用户ID
+    */ 
+    private java.lang.String memberId;
+
+    public java.lang.String getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.String memberId){
+        this.memberId = memberId;
+    }
+	/** kd_ids
+    *关联的文件ID
+    */ 
+    private java.lang.String kdIds;
+
+    public java.lang.String getKdIds(){
+        return this.kdIds;
+    }
+    
+    public void setKdIds(java.lang.String kdIds){
+        this.kdIds = kdIds;
+    }
+	/** train_status
+    *状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
+    */ 
+    private java.lang.String trainStatus;
+
+    public java.lang.String getTrainStatus(){
+        return this.trainStatus;
+    }
+    
+    public void setTrainStatus(java.lang.String trainStatus){
+        this.trainStatus = trainStatus;
+    }
+	/** knowledgeDesc
+    *
+    */ 
+    private java.lang.String knowledgeDesc;
+
+    public String getKnowledgeDesc() {
+        return knowledgeDesc;
+    }
+
+    public void setKnowledgeDesc(String knowledgeDesc) {
+        this.knowledgeDesc = knowledgeDesc;
+    }
+
+    /**
+     * is_open
+     */
+    private String isOpen;
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    /** is_deleted
+    *是否删除 Y 是  N 否
+    */ 
+    private java.lang.String isDeleted;
+
+    public java.lang.String getIsDeleted(){
+        return this.isDeleted;
+    }
+    
+    public void setIsDeleted(java.lang.String isDeleted){
+        this.isDeleted = isDeleted;
+    }
+	/** CREATOR
+    *创建人
+    */ 
+    private java.lang.String creator;
+
+    public java.lang.String getCreator(){
+        return this.creator;
+    }
+    
+    public void setCreator(java.lang.String creator){
+        this.creator = creator;
+    }
+	/** CREATED_TIME
+    *创建时间
+    */ 
+    private java.util.Date createdTime;
+
+    public java.util.Date getCreatedTime(){
+        return this.createdTime;
+    }
+    
+    public void setCreatedTime(java.util.Date createdTime){
+        this.createdTime = createdTime;
+    }
+	/** MODIFIER
+    *修改人
+    */ 
+    private java.lang.String modifier;
+
+    public java.lang.String getModifier(){
+        return this.modifier;
+    }
+    
+    public void setModifier(java.lang.String modifier){
+        this.modifier = modifier;
+    }
+	/** MODIFIED_TIME
+    *修改时间
+    */ 
+    private java.util.Date modifiedTime;
+
+    public java.util.Date getModifiedTime(){
+        return this.modifiedTime;
+    }
+    
+    public void setModifiedTime(java.util.Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+	/** SYS_VERSION
+    *乐观锁,版本号
+    */ 
+    private java.lang.Integer sysVersion;
+
+    public java.lang.Integer getSysVersion(){
+        return this.sysVersion;
+    }
+    
+    public void setSysVersion(java.lang.Integer sysVersion){
+        this.sysVersion = sysVersion;
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/knowledge/model/BizKnowledgeDocumentModel.java

@@ -20,259 +20,304 @@ public class BizKnowledgeDocumentModel extends BaseModelClass implements Seriali
     private static final long serialVersionUID = 1L;
 
 
-    /** kd_id
-    *主键
+    /**
+     * kd_id
+     * 主键
      */
     private Integer kdId;
 
-    @Column(name = "kd_id",length = 10)
-	@Id @GeneratedValue(strategy = GenerationType.AUTO) 
-    public Integer getKdId(){
+    @Column(name = "kd_id", length = 10)
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public Integer getKdId() {
         return this.kdId;
     }
 
-    public void setKdId(Integer kdId){
+    public void setKdId(Integer kdId) {
         this.kdId = kdId;
         super.addValidField("kdId");
     }
 
 
-    /** owner
-    *拥有者：System-系统 、User-用户
+    /**
+     * owner
+     * 拥有者：System-系统 、User-用户
      */
     private String owner;
 
-    @Column(name = "owner",length = 10)
-    public String getOwner(){
+    @Column(name = "owner", length = 10)
+    public String getOwner() {
         return this.owner;
     }
 
-    public void setOwner(String owner){
+    public void setOwner(String owner) {
         this.owner = owner;
         super.addValidField("owner");
     }
 
 
-    /** knowledge_type
-    *知识库类型   QA-问答、Base-基础
+    /**
+     * knowledge_type
+     * 知识库类型   QA-问答、Base-基础
      */
     private String knowledgeType;
 
-    @Column(name = "knowledge_type",length = 10)
-    public String getKnowledgeType(){
+    @Column(name = "knowledge_type", length = 10)
+    public String getKnowledgeType() {
         return this.knowledgeType;
     }
 
-    public void setKnowledgeType(String knowledgeType){
+    public void setKnowledgeType(String knowledgeType) {
         this.knowledgeType = knowledgeType;
         super.addValidField("knowledgeType");
     }
 
 
-    /** document_name
-    *文档名
+    /**
+     * document_name
+     * 文档名
      */
     private String documentName;
 
-    @Column(name = "document_name",length = 100)
-    public String getDocumentName(){
+    @Column(name = "document_name", length = 100)
+    public String getDocumentName() {
         return this.documentName;
     }
 
-    public void setDocumentName(String documentName){
+    public void setDocumentName(String documentName) {
         this.documentName = documentName;
         super.addValidField("documentName");
     }
 
 
-    /** document_url
-    *文件下载地址
+    /**
+     * document_url
+     * 文件下载地址
      */
     private String documentUrl;
 
-    @Column(name = "document_url",length = 225)
-    public String getDocumentUrl(){
+    @Column(name = "document_url", length = 225)
+    public String getDocumentUrl() {
         return this.documentUrl;
     }
 
-    public void setDocumentUrl(String documentUrl){
+    public void setDocumentUrl(String documentUrl) {
         this.documentUrl = documentUrl;
         super.addValidField("documentUrl");
     }
 
 
-    /** char_count
-    *文档字符数
+    /**
+     * char_count
+     * 文档字符数
      */
     private Long charCount;
 
-    @Column(name = "char_count",length = 19)
-    public Long getCharCount(){
+    @Column(name = "char_count", length = 19)
+    public Long getCharCount() {
         return this.charCount;
     }
 
-    public void setCharCount(Long charCount){
+    public void setCharCount(Long charCount) {
         this.charCount = charCount;
         super.addValidField("charCount");
     }
 
 
-    /** upload_time
-    *上传时间
+    /**
+     * upload_time
+     * 上传时间
      */
     private java.util.Date uploadTime;
 
-    @Column(name = "upload_time",length = 19)
-    public java.util.Date getUploadTime(){
+    @Column(name = "upload_time", length = 19)
+    public java.util.Date getUploadTime() {
         return this.uploadTime;
     }
 
-    public void setUploadTime(java.util.Date uploadTime){
+    public void setUploadTime(java.util.Date uploadTime) {
         this.uploadTime = uploadTime;
         super.addValidField("uploadTime");
     }
 
+    /**
+     * 分片规则
+     */
+    private String segmentationConfig;
+
+    @Column(name = "segmentation_config", length = 1073741824)
+    public String getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(String segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+        super.addValidField("segmentationConfig");
+    }
 
-    /** is_enable
-    *是否启用 N-不启用 Y-启用
+    /**
+     * is_enable
+     * 是否启用 N-不启用 Y-启用
      */
     private String isEnable;
 
-    @Column(name = "is_enable",length = 1)
-    public String getIsEnable(){
+    @Column(name = "is_enable", length = 1)
+    public String getIsEnable() {
         return this.isEnable;
     }
 
-    public void setIsEnable(String isEnable){
+    public void setIsEnable(String isEnable) {
         this.isEnable = isEnable;
         super.addValidField("isEnable");
     }
 
 
-    /** knowledge_id
-    *中台知识库ID
+    /**
+     * knowledge_id
+     * 中台知识库ID
      */
     private String knowledgeId;
 
-    @Column(name = "knowledge_id",length = 225)
-    public String getKnowledgeId(){
+    @Column(name = "knowledge_id", length = 225)
+    public String getKnowledgeId() {
         return this.knowledgeId;
     }
 
-    public void setKnowledgeId(String knowledgeId){
+    public void setKnowledgeId(String knowledgeId) {
         this.knowledgeId = knowledgeId;
         super.addValidField("knowledgeId");
     }
 
+    /**
+     * 文档大小【单位：字节】
+     */
+    private Long documentSize;
+
+    @Column(name = "document_size", length = 19)
+    public Long getDocumentSize() {
+        return documentSize;
+    }
+
+    public void setDocumentSize(Long documentSize) {
+        this.documentSize = documentSize;
+        super.addValidField("documentSize");
+    }
 
-    /** train_status
-    *状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
+    /**
+     * train_status
+     * 状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
      */
     private String trainStatus;
 
-    @Column(name = "train_status",length = 15)
-    public String getTrainStatus(){
+    @Column(name = "train_status", length = 15)
+    public String getTrainStatus() {
         return this.trainStatus;
     }
 
-    public void setTrainStatus(String trainStatus){
+    public void setTrainStatus(String trainStatus) {
         this.trainStatus = trainStatus;
         super.addValidField("trainStatus");
     }
 
 
-    /** is_deleted
-    *是否删除 Y 是  N 否
+    /**
+     * is_deleted
+     * 是否删除 Y 是  N 否
      */
     private String isDeleted;
 
-    @Column(name = "is_deleted",length = 1)
-    public String getIsDeleted(){
+    @Column(name = "is_deleted", length = 1)
+    public String getIsDeleted() {
         return this.isDeleted;
     }
 
-    public void setIsDeleted(String isDeleted){
+    public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
         super.addValidField("isDeleted");
     }
 
 
-    /** CREATOR
-    *创建人
+    /**
+     * CREATOR
+     * 创建人
      */
     private String creator;
 
-    @Column(name = "CREATOR",length = 50)
-    public String getCreator(){
+    @Column(name = "CREATOR", length = 50)
+    public String getCreator() {
         return this.creator;
     }
 
-    public void setCreator(String creator){
+    public void setCreator(String creator) {
         this.creator = creator;
         super.addValidField("creator");
     }
 
 
-    /** CREATED_TIME
-    *创建时间
+    /**
+     * CREATED_TIME
+     * 创建时间
      */
     private java.util.Date createdTime;
 
-    @Column(name = "CREATED_TIME",length = 19)
-    public java.util.Date getCreatedTime(){
+    @Column(name = "CREATED_TIME", length = 19)
+    public java.util.Date getCreatedTime() {
         return this.createdTime;
     }
 
-    public void setCreatedTime(java.util.Date createdTime){
+    public void setCreatedTime(java.util.Date createdTime) {
         this.createdTime = createdTime;
         super.addValidField("createdTime");
     }
 
 
-    /** MODIFIER
-    *修改人
+    /**
+     * MODIFIER
+     * 修改人
      */
     private String modifier;
 
-    @Column(name = "MODIFIER",length = 50)
-    public String getModifier(){
+    @Column(name = "MODIFIER", length = 50)
+    public String getModifier() {
         return this.modifier;
     }
 
-    public void setModifier(String modifier){
+    public void setModifier(String modifier) {
         this.modifier = modifier;
         super.addValidField("modifier");
     }
 
 
-    /** MODIFIED_TIME
-    *修改时间
+    /**
+     * MODIFIED_TIME
+     * 修改时间
      */
     private java.util.Date modifiedTime;
 
-    @Column(name = "MODIFIED_TIME",length = 19)
-    public java.util.Date getModifiedTime(){
+    @Column(name = "MODIFIED_TIME", length = 19)
+    public java.util.Date getModifiedTime() {
         return this.modifiedTime;
     }
 
-    public void setModifiedTime(java.util.Date modifiedTime){
+    public void setModifiedTime(java.util.Date modifiedTime) {
         this.modifiedTime = modifiedTime;
         super.addValidField("modifiedTime");
     }
 
 
-    /** SYS_VERSION
-    *乐观锁,版本号
+    /**
+     * SYS_VERSION
+     * 乐观锁,版本号
      */
     private Integer sysVersion;
 
-    @Column(name = "SYS_VERSION",length = 10)
+    @Column(name = "SYS_VERSION", length = 10)
     @Version
-    public Integer getSysVersion(){
+    public Integer getSysVersion() {
         return this.sysVersion;
     }
 
-    public void setSysVersion(Integer sysVersion){
+    public void setSysVersion(Integer sysVersion) {
         this.sysVersion = sysVersion;
         super.addValidField("sysVersion");
     }

src/main/java/cn/com/poc/knowledge/model/BizKnowledgeInfoModel.java

+package cn.com.poc.knowledge.model;
+
+import java.io.Serializable;
+
+import cn.com.yict.framemax.data.model.BaseModelClass;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Version;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+
+/**
+ * Model class for biz_knowledge_info
+ * 知识库信息配置
+ */
+@Entity
+@Table(name = "biz_knowledge_info")
+@DynamicInsert
+@DynamicUpdate
+public class BizKnowledgeInfoModel extends BaseModelClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    private java.lang.Integer id;
+
+    @Column(name = "id", length = 10)
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    public java.lang.Integer getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Integer id) {
+        this.id = id;
+        super.addValidField("id");
+    }
+
+
+    /**
+     * knowledge_name
+     * 知识库名字
+     */
+    private java.lang.String knowledgeName;
+
+    @Column(name = "knowledge_name", length = 100)
+    public java.lang.String getKnowledgeName() {
+        return this.knowledgeName;
+    }
+
+    public void setKnowledgeName(java.lang.String knowledgeName) {
+        this.knowledgeName = knowledgeName;
+        super.addValidField("knowledgeName");
+    }
+
+
+    /**
+     * member_id
+     * 用户ID
+     */
+    private java.lang.String memberId;
+
+    @Column(name = "member_id", length = 100)
+    public java.lang.String getMemberId() {
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.String memberId) {
+        this.memberId = memberId;
+        super.addValidField("memberId");
+    }
+
+
+    /**
+     * kd_ids
+     * 关联的文件ID
+     */
+    private java.lang.String kdIds;
+
+    @Column(name = "kd_ids", length = 1073741824)
+    public java.lang.String getKdIds() {
+        return this.kdIds;
+    }
+
+    public void setKdIds(java.lang.String kdIds) {
+        this.kdIds = kdIds;
+        super.addValidField("kdIds");
+    }
+
+
+    /**
+     * train_status
+     * 状态：未执行-Unopened、 排队-Line 、训练中-Training、 完成-Complete、失败-Fail
+     */
+    private java.lang.String trainStatus;
+
+    @Column(name = "train_status", length = 15)
+    public java.lang.String getTrainStatus() {
+        return this.trainStatus;
+    }
+
+    public void setTrainStatus(java.lang.String trainStatus) {
+        this.trainStatus = trainStatus;
+        super.addValidField("trainStatus");
+    }
+
+
+    /**
+     * knowledge_desc
+     */
+    private java.lang.String knowledgeDesc;
+
+    @Column(name = "knowledge_desc", length = 500)
+    public java.lang.String getKnowledgeDesc() {
+        return this.knowledgeDesc;
+    }
+
+    public void setKnowledgeDesc(java.lang.String knowledgeDesc) {
+        this.knowledgeDesc = knowledgeDesc;
+        super.addValidField("knowledgeDesc");
+    }
+
+    /**
+     * is_open
+     * 是否开启 Y 是  N 否
+     */
+    private java.lang.String isOpen;
+
+    @Column(name = "is_open", length = 1)
+    public java.lang.String getIsOpen() {
+        return this.isOpen;
+    }
+
+    public void setIsOpen(java.lang.String isOpen) {
+        this.isOpen = isOpen;
+        super.addValidField("isOpen");
+    }
+
+
+    /**
+     * is_deleted
+     * 是否删除 Y 是  N 否
+     */
+    private java.lang.String isDeleted;
+
+    @Column(name = "is_deleted", length = 1)
+    public java.lang.String getIsDeleted() {
+        return this.isDeleted;
+    }
+
+    public void setIsDeleted(java.lang.String isDeleted) {
+        this.isDeleted = isDeleted;
+        super.addValidField("isDeleted");
+    }
+
+
+    /**
+     * CREATOR
+     * 创建人
+     */
+    private java.lang.String creator;
+
+    @Column(name = "CREATOR", length = 50)
+    public java.lang.String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(java.lang.String creator) {
+        this.creator = creator;
+        super.addValidField("creator");
+    }
+
+
+    /**
+     * CREATED_TIME
+     * 创建时间
+     */
+    private java.util.Date createdTime;
+
+    @Column(name = "CREATED_TIME", length = 19)
+    public java.util.Date getCreatedTime() {
+        return this.createdTime;
+    }
+
+    public void setCreatedTime(java.util.Date createdTime) {
+        this.createdTime = createdTime;
+        super.addValidField("createdTime");
+    }
+
+
+    /**
+     * MODIFIER
+     * 修改人
+     */
+    private java.lang.String modifier;
+
+    @Column(name = "MODIFIER", length = 50)
+    public java.lang.String getModifier() {
+        return this.modifier;
+    }
+
+    public void setModifier(java.lang.String modifier) {
+        this.modifier = modifier;
+        super.addValidField("modifier");
+    }
+
+
+    /**
+     * MODIFIED_TIME
+     * 修改时间
+     */
+    private java.util.Date modifiedTime;
+
+    @Column(name = "MODIFIED_TIME", length = 19)
+    public java.util.Date getModifiedTime() {
+        return this.modifiedTime;
+    }
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+        super.addValidField("modifiedTime");
+    }
+
+
+    /**
+     * SYS_VERSION
+     * 乐观锁,版本号
+     */
+    private java.lang.Integer sysVersion;
+
+    @Column(name = "SYS_VERSION", length = 10)
+    @Version
+    public java.lang.Integer getSysVersion() {
+        return this.sysVersion;
+    }
+
+    public void setSysVersion(java.lang.Integer sysVersion) {
+        this.sysVersion = sysVersion;
+        super.addValidField("sysVersion");
+    }
+
+
+}
\ No newline at end of file

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

+select
+    id,
+    knowledge_name,
+    member_id,
+    kd_ids,
+    train_status,
+    knowledge_desc,
+    is_open,
+    is_deleted,
+    CREATOR,
+    CREATED_TIME,
+    MODIFIER,
+    MODIFIED_TIME
+from
+    biz_knowledge_info
+where
+    is_deleted = 'N'
+    << and member_id = :memberId>>
+    << and LOCATE(:query ,knowledge_name) >>
+    << and train_status = :trainStatus>>
+order by MODIFIED_TIME
\ No newline at end of file

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

+package cn.com.poc.knowledge.query;   
+
+import java.io.Serializable;
+
+/**
+ * Query Condition class for KnowledgeInfosQuery
+ */
+public class KnowledgeInfosQueryCondition implements Serializable{
+    
+    private static final long serialVersionUID = 1L;
+    
+
+    private java.lang.String memberId;
+    
+    public java.lang.String getMemberId(){
+        return this.memberId;
+    }
+    
+    public void setMemberId(java.lang.String memberId){
+        this.memberId = memberId;
+    }
+        
+
+    private java.lang.String query;
+
+    public String getQuery() {
+        return query;
+    }
+
+    public void setQuery(String query) {
+        this.query = query;
+    }
+
+    private java.lang.String trainStatus;
+    
+    public java.lang.String getTrainStatus(){
+        return this.trainStatus;
+    }
+    
+    public void setTrainStatus(java.lang.String trainStatus){
+        this.trainStatus = trainStatus;
+    }
+        
+}
\ No newline at end of file

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

+package cn.com.poc.knowledge.query;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+import cn.com.yict.framemax.data.model.BaseItemClass;
+
+/**
+ * Query Item class for KnowledgeInfosQuery
+ */
+@Entity
+public class KnowledgeInfosQueryItem extends BaseItemClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     * id
+     */
+    private java.lang.Integer id;
+
+    @Column(name = "id")
+    public java.lang.Integer getId() {
+        return this.id;
+    }
+
+    public void setId(java.lang.Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * knowledge_name
+     * knowledge_name
+     */
+    private java.lang.String knowledgeName;
+
+    @Column(name = "knowledge_name")
+    public java.lang.String getKnowledgeName() {
+        return this.knowledgeName;
+    }
+
+    public void setKnowledgeName(java.lang.String knowledgeName) {
+        this.knowledgeName = knowledgeName;
+    }
+
+    /**
+     * member_id
+     * member_id
+     */
+    private java.lang.String memberId;
+
+    @Column(name = "member_id")
+    public java.lang.String getMemberId() {
+        return this.memberId;
+    }
+
+    public void setMemberId(java.lang.String memberId) {
+        this.memberId = memberId;
+    }
+
+    /**
+     * kd_ids
+     * kd_ids
+     */
+    private java.lang.String kdIds;
+
+    @Column(name = "kd_ids")
+    public java.lang.String getKdIds() {
+        return this.kdIds;
+    }
+
+    public void setKdIds(java.lang.String kdIds) {
+        this.kdIds = kdIds;
+    }
+
+    /**
+     * train_status
+     * train_status
+     */
+    private java.lang.String trainStatus;
+
+    @Column(name = "train_status")
+    public java.lang.String getTrainStatus() {
+        return this.trainStatus;
+    }
+
+    public void setTrainStatus(java.lang.String trainStatus) {
+        this.trainStatus = trainStatus;
+    }
+
+    /**
+     * knowledge_desc
+     * knowledge_desc
+     */
+    private java.lang.String knowledgeDesc;
+
+    @Column(name = "knowledge_desc")
+    public java.lang.String getKnowledgeDesc() {
+        return this.knowledgeDesc;
+    }
+
+    public void setKnowledgeDesc(java.lang.String knowledgeDesc) {
+        this.knowledgeDesc = knowledgeDesc;
+    }
+
+    /**
+     * is_open
+     */
+    private java.lang.String isOpen;
+
+    @Column(name = "is_open")
+    public java.lang.String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(java.lang.String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+
+    /**
+     * is_deleted
+     * is_deleted
+     */
+    private java.lang.String isDeleted;
+
+    @Column(name = "is_deleted")
+    public java.lang.String getIsDeleted() {
+        return this.isDeleted;
+    }
+
+    public void setIsDeleted(java.lang.String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    /**
+     * CREATOR
+     * CREATOR
+     */
+    private java.lang.String creator;
+
+    @Column(name = "CREATOR")
+    public java.lang.String getCreator() {
+        return this.creator;
+    }
+
+    public void setCreator(java.lang.String creator) {
+        this.creator = creator;
+    }
+
+    /**
+     * CREATED_TIME
+     * CREATED_TIME
+     */
+    private java.util.Date createdTime;
+
+    @Column(name = "CREATED_TIME")
+    public java.util.Date getCreatedTime() {
+        return this.createdTime;
+    }
+
+    public void setCreatedTime(java.util.Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    /**
+     * MODIFIER
+     * MODIFIER
+     */
+    private java.lang.String modifier;
+
+    @Column(name = "MODIFIER")
+    public java.lang.String getModifier() {
+        return this.modifier;
+    }
+
+    public void setModifier(java.lang.String modifier) {
+        this.modifier = modifier;
+    }
+
+    /**
+     * MODIFIED_TIME
+     * MODIFIED_TIME
+     */
+    private java.util.Date modifiedTime;
+
+    @Column(name = "MODIFIED_TIME")
+    public java.util.Date getModifiedTime() {
+        return this.modifiedTime;
+    }
+
+    public void setModifiedTime(java.util.Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+} 
\ No newline at end of file

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

@@ -5,6 +5,8 @@ select
     bkd.document_name,
     bkd.document_url,
     bkd.char_count,
+    bkd.segmentation_config,
+    bkd.document_size,
     bkd.upload_time,
     bkd.is_enable,
     bkd.knowledge_id,
@@ -17,4 +19,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/query/KnowledgeQueryItem.java

@@ -10,147 +10,182 @@ import java.io.Serializable;
  * Query Item class for KnowledgeQuery
  */
 @Entity
-public class KnowledgeQueryItem extends BaseItemClass implements Serializable{
+public class KnowledgeQueryItem extends BaseItemClass implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /** kd_id
-    *kd_id
+    /**
+     * kd_id
+     * kd_id
      */
     private Integer kdId;
 
     @Column(name = "kd_id")
-    public Integer getKdId(){
+    public Integer getKdId() {
         return this.kdId;
     }
 
-    public void setKdId(Integer kdId){
+    public void setKdId(Integer kdId) {
         this.kdId = kdId;
     }
 
-    /** owner
-    *owner
+    /**
+     * owner
+     * owner
      */
     private String owner;
 
     @Column(name = "owner")
-    public String getOwner(){
+    public String getOwner() {
         return this.owner;
     }
 
-    public void setOwner(String owner){
+    public void setOwner(String owner) {
         this.owner = owner;
     }
 
-    /** knowledge_type
-    *knowledge_type
+    /**
+     * knowledge_type
+     * knowledge_type
      */
     private String knowledgeType;
 
     @Column(name = "knowledge_type")
-    public String getKnowledgeType(){
+    public String getKnowledgeType() {
         return this.knowledgeType;
     }
 
-    public void setKnowledgeType(String knowledgeType){
+    public void setKnowledgeType(String knowledgeType) {
         this.knowledgeType = knowledgeType;
     }
 
-    /** document_name
-    *document_name
+    /**
+     * document_name
+     * document_name
      */
     private String documentName;
 
     @Column(name = "document_name")
-    public String getDocumentName(){
+    public String getDocumentName() {
         return this.documentName;
     }
 
-    public void setDocumentName(String documentName){
+    public void setDocumentName(String documentName) {
         this.documentName = documentName;
     }
 
-    /** document_url
-    *document_url
+    /**
+     * document_url
+     * document_url
      */
     private String documentUrl;
 
     @Column(name = "document_url")
-    public String getDocumentUrl(){
+    public String getDocumentUrl() {
         return this.documentUrl;
     }
 
-    public void setDocumentUrl(String documentUrl){
+    public void setDocumentUrl(String documentUrl) {
         this.documentUrl = documentUrl;
     }
 
-    /** char_count
-    *char_count
+    /**
+     * char_count
+     * char_count
      */
     private Long charCount;
 
     @Column(name = "char_count")
-    public Long getCharCount(){
+    public Long getCharCount() {
         return this.charCount;
     }
 
-    public void setCharCount(Long charCount){
+    public void setCharCount(Long charCount) {
         this.charCount = charCount;
     }
 
-    /** upload_time
-    *upload_time
+    /**
+     * document_size
+     */
+    private Long documentSize;
+
+    @Column(name = "document_size")
+    public Long getDocumentSize() {
+        return this.documentSize;
+    }
+
+    public void setDocumentSize(Long documentSize) {
+        this.documentSize = documentSize;
+    }
+
+    /**
+     * upload_time
+     * upload_time
      */
     private java.util.Date uploadTime;
 
     @Column(name = "upload_time")
-    public java.util.Date getUploadTime(){
+    public java.util.Date getUploadTime() {
         return this.uploadTime;
     }
 
-    public void setUploadTime(java.util.Date uploadTime){
+    public void setUploadTime(java.util.Date uploadTime) {
         this.uploadTime = uploadTime;
     }
 
-    /** is_enable
-    *is_enable
+    private String segmentationConfig;
+
+    @Column(name = "segmentation_config")
+    public String getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(String segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+    }
+
+    /**
+     * is_enable
+     * is_enable
      */
     private String isEnable;
 
     @Column(name = "is_enable")
-    public String getIsEnable(){
+    public String getIsEnable() {
         return this.isEnable;
     }
 
-    public void setIsEnable(String isEnable){
+    public void setIsEnable(String isEnable) {
         this.isEnable = isEnable;
     }
 
-    /** knowledge_id
-    *knowledge_id
+    /**
+     * knowledge_id
+     * knowledge_id
      */
     private String knowledgeId;
 
     @Column(name = "knowledge_id")
-    public String getKnowledgeId(){
+    public String getKnowledgeId() {
         return this.knowledgeId;
     }
 
-    public void setKnowledgeId(String knowledgeId){
+    public void setKnowledgeId(String knowledgeId) {
         this.knowledgeId = knowledgeId;
     }
 
-    /** train_status
-    *train_status
+    /**
+     * train_status
+     * train_status
      */
     private String trainStatus;
 
     @Column(name = "train_status")
-    public String getTrainStatus(){
+    public String getTrainStatus() {
         return this.trainStatus;
     }
 
-    public void setTrainStatus(String trainStatus){
+    public void setTrainStatus(String trainStatus) {
         this.trainStatus = trainStatus;
     }
 

src/main/java/cn/com/poc/knowledge/repository/BizKnowledgeInfoRepository.java

+package cn.com.poc.knowledge.repository;	
+import cn.com.yict.framemax.data.repository.Repository;
+import cn.com.poc.knowledge.model.BizKnowledgeInfoModel;
+
+public interface BizKnowledgeInfoRepository extends Repository<BizKnowledgeInfoModel,java.lang.Integer> {
+}
\ No newline at end of file

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

 package cn.com.poc.knowledge.rest;
 
 import cn.com.poc.knowledge.dto.BizKnowledgeDocumentDto;
+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.yict.framemax.core.rest.BaseRest;
 import cn.com.yict.framemax.data.model.PagingInfo;
 import cn.com.yict.framemax.web.permission.Access;
@@ -14,7 +18,6 @@ import java.util.List;
 @Permission(Access.Safety)
 public interface KnowledgeRest extends BaseRest {
 
-
     /**
      * 上传文档
      *
@@ -26,10 +29,20 @@ public interface KnowledgeRest extends BaseRest {
     /**
      * 删除文档
      *
+     * @param knowledgeInfoId 知识库ID
+     * @param kdId            文档ID
+     * @return 是否成功
+     */
+    Boolean delDocument(@RequestParam Integer knowledgeInfoId, @RequestParam Integer kdId);
+
+    /**
+     * 批量删除文档
+     *
+     * @param knowledgeInfoId
      * @param kdId            主键ID
      * @return 是否成功
      */
-    Boolean delDocument(@RequestParam Integer kdId);
+    Boolean batchDelDocument(@RequestParam Integer knowledgeInfoId, @RequestBody List<Integer> kdId);
 
 
     /**
@@ -39,24 +52,33 @@ public interface KnowledgeRest extends BaseRest {
 
     /**
      * 启用 / 关闭
-     *
-     * @
      */
     String enableKnowledge(@RequestParam Integer kdId) throws Exception;
 
     /**
      * 开启训练
      */
-    Boolean trainKnowledge(@RequestBody List<Integer> kdIds) throws Exception;
+    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;
 
+    /**
+     * 获取知识库的文档列表
+     *
+     * @param knowledgeInfoId
+     * @return
+     * @throws Exception
+     */
+    List<BizKnowledgeDocumentDto> getKdIdsByKnowledgeInfoId(@RequestParam Integer knowledgeInfoId) throws Exception;
 
     /**
-     * 获取知识库
+     * 获取知识库的文档列表
      *
      * @param kdIds
      * @return
@@ -64,5 +86,61 @@ public interface KnowledgeRest extends BaseRest {
      */
     List<BizKnowledgeDocumentDto> getListByKdIds(@RequestBody List<Integer> kdIds);
 
+    /**
+     * 获取知识库详情
+     */
+    BizKnowledgeInfoDto getKnowledgeDetail(@RequestParam Integer knowledgeInfoId) throws Exception;
+
+    /**
+     * 获取用户知识库列表
+     *
+     * @param search      搜索条件
+     * @param trainStatus 训练状态
+     */
+    List<BizKnowledgeInfoDto> getKnowledgeList(@RequestParam(required = false) String search, @RequestParam(required = false) String trainStatus, PagingInfo pagingInfo) throws Exception;
+
+    /**
+     * 创建知识库
+     */
+    BizKnowledgeInfoDto createKnowledge(@RequestBody BizKnowledgeInfoDto dto) throws Exception;
+
+    /**
+     * 更新知识库
+     */
+    BizKnowledgeInfoDto updateKnowledgeInfo(@RequestBody BizKnowledgeInfoDto dto) throws Exception;
+
+    /**
+     * 开启关闭知识库
+     */
+    void enableKnowledgeInfo(@RequestParam Integer knowledgeInfoId, @RequestParam String isOpen) throws Exception;
+
+    /**
+     * 删除知识库
+     */
+    void deleteKnowledgeInfo(@RequestParam Integer knowledgeInfoId) throws Exception;
+
+    /**
+     * 开关知识库分片
+     */
+    void openKnowledgeChunk(@RequestBody UpsertChunkInfoDto dto);
 
+    /**
+     * 删除知识库分片
+     */
+    void deleteKnowledgeChunk(@RequestBody UpsertChunkInfoDto dto);
+
+    /**
+     * 更新知识库分片内容
+     */
+    void updateKnowledgeChunkDoc(@RequestBody UpsertChunkInfoDto dto);
+
+    /**
+     * 新增知识库分片
+     */
+    void addKnowledgeChunk(@RequestBody UpsertChunkInfoDto dto);
+
+    /**
+     * 获取知识库分片信息
+     */
+    GetKnowledgeChunkInfoResult getChunks(@RequestParam List<Integer> kdIds, PagingInfo pagingInfo);
 }

src/main/java/cn/com/poc/knowledge/scheduler/KnowledgeInfoScheduler.java

+package cn.com.poc.knowledge.scheduler;
+
+
+import cn.com.poc.knowledge.constant.KnowledgeConstant;
+import cn.com.poc.knowledge.query.KnowledgeInfosQueryCondition;
+import cn.com.poc.knowledge.query.KnowledgeInfosQueryItem;
+import cn.com.poc.knowledge.service.BizKnowledgeInfoService;
+import cn.com.poc.message.entity.KnowledgeTrainStatusMessage;
+import cn.com.poc.message.service.KnowledgeProducerService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Component
+public class KnowledgeInfoScheduler {
+
+    @Resource
+    private KnowledgeProducerService knowledgeProducerService;
+
+    @Resource
+    private BizKnowledgeInfoService bizKnowledgeInfoService;
+
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void knowledgeInfoStatusUpdateScheduler() throws Exception {
+        KnowledgeInfosQueryCondition condition = new KnowledgeInfosQueryCondition();
+        condition.setTrainStatus(KnowledgeConstant.TrainStatus.TRAINING);
+
+        List<KnowledgeInfosQueryItem> items = bizKnowledgeInfoService.knowledgeInfos(condition, null);
+        for (KnowledgeInfosQueryItem item : items) {
+            KnowledgeTrainStatusMessage knowledgeTrainStatusMessage = new KnowledgeTrainStatusMessage();
+            knowledgeTrainStatusMessage.setKnowledgeInfoId(item.getId());
+            knowledgeProducerService.knowledgeInfoStatusCheck(knowledgeTrainStatusMessage);
+        }
+    }
+}

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/BizKnowledgeInfoService.java

+package cn.com.poc.knowledge.service;
+
+import cn.com.poc.knowledge.query.KnowledgeInfosQueryCondition;
+import cn.com.poc.knowledge.query.KnowledgeInfosQueryItem;
+import cn.com.poc.knowledge.query.KnowledgeQueryItem;
+import cn.com.yict.framemax.core.service.BaseService;
+import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
+import cn.com.yict.framemax.data.model.PagingInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface BizKnowledgeInfoService extends BaseService {
+
+    BizKnowledgeInfoEntity get(java.lang.Integer id) throws Exception;
+
+    List<BizKnowledgeInfoEntity> findByExample(BizKnowledgeInfoEntity example, PagingInfo pagingInfo) throws Exception;
+
+    BizKnowledgeInfoEntity save(BizKnowledgeInfoEntity entity) throws Exception;
+
+    BizKnowledgeInfoEntity update(BizKnowledgeInfoEntity entity) throws Exception;
+
+    void deletedById(java.lang.Integer id) throws Exception;
+
+    List<KnowledgeInfosQueryItem> knowledgeInfos(KnowledgeInfosQueryCondition condition, PagingInfo pagingInfo) throws Exception;
+
+    void removeDocument(Integer knowledgeInfoId, Integer kdId);
+
+}
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package cn.com.poc.knowledge.service.impl;
 
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.Assert;
+import cn.com.poc.common.utils.JsonUtils;
 import cn.com.poc.knowledge.convert.KnowledgeDocumentConvert;
 import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity;
 import cn.com.poc.knowledge.model.BizKnowledgeDocumentModel;
@@ -64,6 +65,10 @@ public class BizKnowledgeDocumentServiceImpl extends BaseServiceImpl
         BeanUtil.copyProperties(entity, bizKnowledgeDocumentModel, new CopyOptions() {{
             setIgnoreNullValue(true);
         }});
+        if (null != entity.getSegmentationConfig()) {
+            String config = JsonUtils.serialize(entity.getSegmentationConfig());
+            bizKnowledgeDocumentModel.setSegmentationConfig(config);
+        }
         BizKnowledgeDocumentModel updateModel = this.repository.save(bizKnowledgeDocumentModel);
         return KnowledgeDocumentConvert.modelToEntity(updateModel);
     }
@@ -81,12 +86,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

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

+package cn.com.poc.knowledge.service.impl;
+
+import cn.com.poc.common.utils.JsonUtils;
+import cn.com.poc.common.utils.StringUtils;
+import cn.com.poc.knowledge.query.KnowledgeInfosQueryCondition;
+import cn.com.poc.knowledge.query.KnowledgeInfosQueryItem;
+import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
+import cn.com.poc.knowledge.service.BizKnowledgeInfoService;
+import cn.com.poc.knowledge.model.BizKnowledgeInfoModel;
+import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
+import cn.com.poc.knowledge.convert.BizKnowledgeInfoConvert;
+import cn.com.poc.knowledge.repository.BizKnowledgeInfoRepository;
+import cn.com.yict.framemax.data.model.PagingInfo;
+import com.alibaba.fastjson.TypeReference;
+import org.apache.commons.collections4.ListUtils;
+import org.springframework.stereotype.Service;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.stream.Collectors;
+import java.util.List;
+import javax.annotation.Resource;
+
+import org.springframework.util.Assert;
+
+@Service
+public class BizKnowledgeInfoServiceImpl extends BaseServiceImpl
+        implements BizKnowledgeInfoService {
+
+    @Resource
+    private BizKnowledgeInfoRepository repository;
+
+    public BizKnowledgeInfoEntity get(java.lang.Integer id) throws Exception {
+        Assert.notNull(id);
+        BizKnowledgeInfoModel model = this.repository.get(id);
+        if (model == null) {
+            return null;
+        }
+        if ("Y".equals(model.getIsDeleted())) {
+            return null;
+        }
+        return BizKnowledgeInfoConvert.modelToEntity(model);
+    }
+
+
+    public List<BizKnowledgeInfoEntity> findByExample(BizKnowledgeInfoEntity example, PagingInfo pagingInfo) throws Exception {
+        List<BizKnowledgeInfoEntity> result = new ArrayList<BizKnowledgeInfoEntity>();
+        BizKnowledgeInfoModel model = new BizKnowledgeInfoModel();
+        if (example != null) {
+            model = BizKnowledgeInfoConvert.entityToModel(example);
+        }
+        model.setIsDeleted("N");
+        List<BizKnowledgeInfoModel> models = this.repository.findByExample(model, pagingInfo);
+        if (CollectionUtils.isNotEmpty(models)) {
+            result = models.stream().map(BizKnowledgeInfoConvert::modelToEntity).collect(Collectors.toList());
+        }
+        return result;
+    }
+
+    public BizKnowledgeInfoEntity save(BizKnowledgeInfoEntity entity) throws Exception {
+        Assert.notNull(entity);
+        entity.setId(null);
+        entity.setIsDeleted("N");
+        BizKnowledgeInfoModel model = BizKnowledgeInfoConvert.entityToModel(entity);
+        BizKnowledgeInfoModel saveModel = this.repository.save(model);
+        return BizKnowledgeInfoConvert.modelToEntity(saveModel);
+    }
+
+    public BizKnowledgeInfoEntity update(BizKnowledgeInfoEntity entity) throws Exception {
+        Assert.notNull(entity);
+        Assert.notNull(entity.getId(), "update pk can not be null");
+        BizKnowledgeInfoModel model = this.repository.get(entity.getId());
+
+        if (entity.getKnowledgeName() != null) {
+            model.setKnowledgeName(entity.getKnowledgeName());
+        }
+        if (entity.getMemberId() != null) {
+            model.setMemberId(entity.getMemberId());
+        }
+        if (entity.getKdIds() != null) {
+            model.setKdIds(entity.getKdIds());
+        }
+        if (entity.getTrainStatus() != null) {
+            model.setTrainStatus(entity.getTrainStatus());
+        }
+        if (entity.getKnowledgeDesc() != null) {
+            model.setKnowledgeDesc(entity.getKnowledgeDesc());
+        }
+        if (entity.getIsDeleted() != null) {
+            model.setIsDeleted(entity.getIsDeleted());
+        }
+        if (entity.getIsOpen() != null) {
+            model.setIsOpen(entity.getIsOpen());
+        }
+        if (entity.getSysVersion() != null) {
+            model.setSysVersion(entity.getSysVersion());
+        }
+        BizKnowledgeInfoModel saveModel = this.repository.save(model);
+        return BizKnowledgeInfoConvert.modelToEntity(saveModel);
+    }
+
+    public void deletedById(java.lang.Integer id) throws Exception {
+        Assert.notNull(id);
+        BizKnowledgeInfoModel model = this.repository.get(id);
+        if (model != null) {
+            if ("N".equals(model.getIsDeleted())) {
+                model.setIsDeleted("Y");
+                this.repository.save(model);
+            }
+        }
+    }
+
+    @Override
+    public List<KnowledgeInfosQueryItem> knowledgeInfos(KnowledgeInfosQueryCondition condition, PagingInfo pagingInfo) throws Exception {
+        return this.sqlDao.query(condition, KnowledgeInfosQueryItem.class, "MODIFIED_TIME DESC",pagingInfo);
+    }
+
+    @Override
+    public void removeDocument(Integer knowledgeInfoId, Integer kdId) {
+        BizKnowledgeInfoModel bizKnowledgeInfoModel = this.repository.get(knowledgeInfoId);
+        if (bizKnowledgeInfoModel != null) {
+            String kdIds = bizKnowledgeInfoModel.getKdIds();
+            if (!StringUtils.isEmpty(kdIds)) {
+                List<String> kdIdList = JsonUtils.deSerialize(kdIds, new TypeReference<List<String>>() {
+                }.getType());
+                kdIdList.remove(kdId.toString());
+
+
+                kdIds = JsonUtils.serialize(kdIdList.stream().map(Integer::valueOf).collect(Collectors.toList()));
+                bizKnowledgeInfoModel.setKdIds(kdIds);
+                this.repository.save(bizKnowledgeInfoModel);
+            }
+        }
+    }
+}
\ No newline at end of file

src/main/java/cn/com/poc/message/entity/KnowledgeTrainStatusMessage.java

@@ -4,12 +4,22 @@ import java.io.Serializable;
 
 public class KnowledgeTrainStatusMessage implements Serializable {
 
+    private Integer knowledgeInfoId;
+
     private Integer kdId;
 
     private String status;
 
     private String knowledgeId;
 
+    public Integer getKnowledgeInfoId() {
+        return knowledgeInfoId;
+    }
+
+    public void setKnowledgeInfoId(Integer knowledgeInfoId) {
+        this.knowledgeInfoId = knowledgeInfoId;
+    }
+
     public String getKnowledgeId() {
         return knowledgeId;
     }

src/main/java/cn/com/poc/message/entity/TrainKnowledgeMessage.java

 package cn.com.poc.message.entity;
 
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
+
 import java.io.Serializable;
 import java.util.Map;
 
 public class TrainKnowledgeMessage implements Serializable {
 
+    private Integer knowledgeInfoId;
 
     private Integer kid;
 
@@ -12,6 +15,24 @@ public class TrainKnowledgeMessage implements Serializable {
 
     private Map<Integer, Integer> reduced;
 
+    private SegmentationConfigRequest segmentationConfig;
+
+    public Integer getKnowledgeInfoId() {
+        return knowledgeInfoId;
+    }
+
+    public void setKnowledgeInfoId(Integer knowledgeInfoId) {
+        this.knowledgeInfoId = knowledgeInfoId;
+    }
+
+    public SegmentationConfigRequest getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(SegmentationConfigRequest segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+    }
+
     public Map<Integer, Integer> getReduced() {
         return reduced;
     }
@@ -42,6 +63,7 @@ public class TrainKnowledgeMessage implements Serializable {
                 "kid=" + kid +
                 ", fileUrl='" + fileUrl + '\'' +
                 ", reduced=" + reduced +
+                ", segmentationConfig=" + segmentationConfig +
                 '}';
     }
 }

src/main/java/cn/com/poc/message/service/KnowledgeConsumerService.java

@@ -19,4 +19,10 @@ public interface KnowledgeConsumerService extends BaseService {
      * 训练状态更新
      */
     void trainStatusUpdate(KnowledgeTrainStatusMessage message) throws Exception;
+
+    /**
+     * 检查知识库信息状态改变
+     */
+    void knowledgeInfoStatusCheck(KnowledgeTrainStatusMessage knowledgeTrainStatusMessage) throws Exception;
+
 }

src/main/java/cn/com/poc/message/service/KnowledgeProducerService.java

@@ -21,4 +21,10 @@ public interface KnowledgeProducerService extends BaseService {
      */
     KnowledgeTrainStatusMessage trainStatusUpdate(KnowledgeTrainStatusMessage knowledgeTrainStatusMessage);
 
+
+    /**
+     * 检查知识库信息状态改变
+     */
+    KnowledgeTrainStatusMessage knowledgeInfoStatusCheck(KnowledgeTrainStatusMessage knowledgeTrainStatusMessage);
+
 }

src/main/java/cn/com/poc/message/service/impl/KnowledgeConsumerServiceImpl.java

@@ -2,13 +2,15 @@ package cn.com.poc.message.service.impl;
 
 
 import cn.com.poc.common.constant.CommonConstant;
+import cn.com.poc.common.utils.Assert;
+import cn.com.poc.common.utils.JsonUtils;
 import cn.com.poc.knowledge.constant.KnowledgeConstant;
 import cn.com.poc.knowledge.entity.BizKnowledgeDocumentEntity;
+import cn.com.poc.knowledge.entity.BizKnowledgeInfoEntity;
 import cn.com.poc.knowledge.entity.BizKnowledgeTrainLogEntity;
-import cn.com.poc.knowledge.entity.BizMemberKnowledgeRelationEntity;
 import cn.com.poc.knowledge.service.BizKnowledgeDocumentService;
+import cn.com.poc.knowledge.service.BizKnowledgeInfoService;
 import cn.com.poc.knowledge.service.BizKnowledgeTrainLogService;
-import cn.com.poc.knowledge.service.BizMemberKnowledgeRelationService;
 import cn.com.poc.message.entity.KnowledgeTrainStatusMessage;
 import cn.com.poc.message.entity.TrainKnowledgeMessage;
 import cn.com.poc.message.service.KnowledgeConsumerService;
@@ -17,13 +19,13 @@ import cn.com.poc.message.topic.KnowledgeTopic;
 import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
 import cn.com.yict.framemax.core.exception.BusinessException;
 import cn.com.yict.framemax.tumbleweed.client.annotation.Consumer;
-import org.apache.commons.collections4.MapUtils;
+import com.alibaba.fastjson.TypeReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 
 
@@ -42,16 +44,10 @@ public class KnowledgeConsumerServiceImpl implements KnowledgeConsumerService {
     private DemandKnowledgeService demandKnowledgeService;
 
     @Resource
-    private BizMemberKnowledgeRelationService bizMemberKnowledgeRelationService;
-
-//    @Resource
-//    private BizAiGcMemberUsageDetailsService bizAiGcMemberUsageDetailsService;
-//
-//    @Resource
-//    private AiGcMemberFreqProducerService aiGcMemberFreqProducerService;
+    private KnowledgeProducerService knowledgeProducerService;
 
     @Resource
-    private KnowledgeProducerService knowledgeProducerService;
+    private BizKnowledgeInfoService bizKnowledgeInfoService;
 
 
     /**
@@ -61,15 +57,16 @@ public class KnowledgeConsumerServiceImpl implements KnowledgeConsumerService {
      * @return
      */
     @Override
-    @Consumer(topic = KnowledgeTopic.TRAIN_KNOWLEDGE, scale = 5, retry = false)
+    @Consumer(topic = KnowledgeTopic.TRAIN_KNOWLEDGE, scale = 3, retry = true)
     public void trainKnowledge(TrainKnowledgeMessage message) throws Exception {
         //修改训练状态
         KnowledgeTrainStatusMessage trainStatusMessage = new KnowledgeTrainStatusMessage();
         trainStatusMessage.setStatus(KnowledgeConstant.TrainStatus.TRAINING);
         trainStatusMessage.setKdId(message.getKid());
+        trainStatusMessage.setKnowledgeInfoId(message.getKnowledgeInfoId());
         knowledgeProducerService.trainStatusUpdate(trainStatusMessage);
         try {
-            String knowledgeId = demandKnowledgeService.trainKnowledge(message.getFileUrl());
+            String knowledgeId = demandKnowledgeService.trainKnowledge(message.getFileUrl(), message.getSegmentationConfig());
 
             //训练日志
             BizKnowledgeTrainLogEntity bizKnowledgeTrainLogEntity = new BizKnowledgeTrainLogEntity();
@@ -85,9 +82,8 @@ public class KnowledgeConsumerServiceImpl implements KnowledgeConsumerService {
             completeMessage.setStatus(KnowledgeConstant.TrainStatus.COMPLETE);
             completeMessage.setKdId(message.getKid());
             completeMessage.setKnowledgeId(knowledgeId);
+            completeMessage.setKnowledgeInfoId(message.getKnowledgeInfoId());
             knowledgeProducerService.trainStatusUpdate(completeMessage);
-            //保存明细
-//            saveUsageDetailByKnowledgeTrain(message.getKid());
         } catch (BusinessException e) {
             logger.warn("--------------message:{},知识库训练失败：{}------------", message, e.getMessage());
 
@@ -107,14 +103,12 @@ public class KnowledgeConsumerServiceImpl implements KnowledgeConsumerService {
             bizKnowledgeTrainLogService.save(bizKnowledgeTrainLogEntity);
             logger.warn("-------保存知识库训练失败日志----------");
 
-            //次数回滚
-//            if (MapUtils.isNotEmpty(message.getReduced())) {
-//                logger.warn("----------知识库训练失败，训练次数回滚【开始】-------------");
-//                AiGcMemberFreqMessage aiGcMemberFreqMessage = new AiGcMemberFreqMessage();
-//                aiGcMemberFreqMessage.setReduceMap(message.getReduced());
-//                aiGcMemberFreqProducerService.rollbackNum(aiGcMemberFreqMessage);
-//                logger.warn("----------知识库训练失败，训练次数回滚【结束】-------------");
-//            }
+
+            BizKnowledgeInfoEntity bizKnowledgeInfoEntity = bizKnowledgeInfoService.get(message.getKnowledgeInfoId());
+            bizKnowledgeInfoEntity.setTrainStatus(KnowledgeConstant.TrainStatus.FAIL);
+            bizKnowledgeInfoService.update(bizKnowledgeInfoEntity);
+            logger.warn("-------保存知识库训练失败状态----------");
+
         }
     }
 
@@ -126,28 +120,38 @@ public class KnowledgeConsumerServiceImpl implements KnowledgeConsumerService {
         bizKnowledgeDocumentEntity.setTrainStatus(message.getStatus());
         bizKnowledgeDocumentEntity.setKnowledgeId(message.getKnowledgeId());
         bizKnowledgeDocumentService.update(message.getKdId(), bizKnowledgeDocumentEntity);
+        knowledgeProducerService.knowledgeInfoStatusCheck(message);
+    }
+
+
+    @Override
+    @Consumer(topic = KnowledgeTopic.KNOWLEDGE_INFO_STATUS_CHECK, scale = 3, retry = true)
+    public void knowledgeInfoStatusCheck(KnowledgeTrainStatusMessage knowledgeTrainStatusMessage) throws Exception {
+        Assert.notNull(knowledgeTrainStatusMessage.getKnowledgeInfoId());
+        BizKnowledgeInfoEntity bizKnowledgeInfoEntity = bizKnowledgeInfoService.get(knowledgeTrainStatusMessage.getKnowledgeInfoId());
+        if (!KnowledgeConstant.TrainStatus.TRAINING.equals(bizKnowledgeInfoEntity.getTrainStatus())) {
+            return;
         }
 
-    private void saveUsageDetailByKnowledgeTrain(Integer kdId) throws Exception {
-        BizMemberKnowledgeRelationEntity bizMemberKnowledgeRelationEntity = new BizMemberKnowledgeRelationEntity();
-        bizMemberKnowledgeRelationEntity.setMemberType("system");
-        bizMemberKnowledgeRelationEntity.setKdId(kdId);
-        bizMemberKnowledgeRelationEntity.setIsDeleted(CommonConstant.IsDeleted.N);
-        List<BizMemberKnowledgeRelationEntity> entities = bizMemberKnowledgeRelationService.findByExample(bizMemberKnowledgeRelationEntity, null);
-//        BizMemberKnowledgeRelationEntity memberKnowledgeRelationEntity = entities.get(0);
-//
-//        BizKnowledgeDocumentEntity bizKnowledgeDocumentEntity = bizKnowledgeDocumentService.get(kdId);
-//        AiGcMemberUsageDetailsEntity aiGcMemberUsageDetailsEntity = new AiGcMemberUsageDetailsEntity();
-//        aiGcMemberUsageDetailsEntity.setRelationId(memberKnowledgeRelationEntity.getMemberId());
-//        aiGcMemberUsageDetailsEntity.setDomain(AiGcPaymentConfigurationConstant.DOMAIN.TRAIN);
-//        aiGcMemberUsageDetailsEntity.setTitile(bizKnowledgeDocumentEntity.getDocumentName());
-//        aiGcMemberUsageDetailsEntity.setDate(new Date());
-//        aiGcMemberUsageDetailsEntity.setScenes(null);
-//        aiGcMemberUsageDetailsEntity.setDetailType("知识库训练");
-//        aiGcMemberUsageDetailsEntity.setOperation(AiGcMemberUsageDetailsConstant.Operation.USE);
-//        aiGcMemberUsageDetailsEntity.setNum(bizKnowledgeDocumentEntity.getCharCount().intValue());
-//        aiGcMemberUsageDetailsEntity.setIsDeleted(MkpCommonConstant.IsDeleted.N);
-//        bizAiGcMemberUsageDetailsService.save(aiGcMemberUsageDetailsEntity);
+        String kdIds = bizKnowledgeInfoEntity.getKdIds();
+        List<Integer> kdIdList = JsonUtils.deSerialize(kdIds, new TypeReference<List<Integer>>() {
+        }.getType());
+
+        boolean isAllComplete = true;
+        logger.info("-------知识库训练状态检查，kdIds:{}-------", kdIds);
+        for (Integer kdId : kdIdList) {
+            BizKnowledgeDocumentEntity documentEntity = bizKnowledgeDocumentService.get(kdId);
+            if (!documentEntity.getTrainStatus().equals(KnowledgeConstant.TrainStatus.COMPLETE)) {
+                isAllComplete = false;
+                break;
+            }
         }
 
+        if (isAllComplete) {
+            logger.info("-------知识库训练状态检查，全部完成, knowledgeInfoId:{}-------", knowledgeTrainStatusMessage.getKnowledgeInfoId());
+            bizKnowledgeInfoEntity.setTrainStatus(KnowledgeConstant.TrainStatus.COMPLETE);
+            bizKnowledgeInfoService.update(bizKnowledgeInfoEntity);
+        }
+
+    }
 }

src/main/java/cn/com/poc/message/service/impl/KnowledgeProducerServiceImpl.java

@@ -31,4 +31,10 @@ public class KnowledgeProducerServiceImpl implements KnowledgeProducerService {
     public KnowledgeTrainStatusMessage trainStatusUpdate(KnowledgeTrainStatusMessage knowledgeTrainStatusMessage) {
         return knowledgeTrainStatusMessage;
     }
+
+    @Override
+    @Producer(topic = KnowledgeTopic.KNOWLEDGE_INFO_STATUS_CHECK, publishPoint = PublishPoint.PUBLISH_REAL_TIME)
+    public KnowledgeTrainStatusMessage knowledgeInfoStatusCheck(KnowledgeTrainStatusMessage knowledgeTrainStatusMessage) {
+        return knowledgeTrainStatusMessage;
+    }
 }

src/main/java/cn/com/poc/message/topic/KnowledgeTopic.java

@@ -7,5 +7,7 @@ public interface KnowledgeTopic {
 
     String TRAIN_STATUS = "TRAIN_STATUS";
 
+    String KNOWLEDGE_INFO_STATUS_CHECK = "KNOWLEDGE_INFO_STATUS_CHECK";
+
 
 }

src/main/java/cn/com/poc/support/dgTools/DgtoolsAbstractHttpClient.java

@@ -11,6 +11,7 @@ import cn.com.poc.support.dgTools.result.AbstractResult;
 import cn.com.poc.support.dgTools.result.DgtoolsApiResult;
 import cn.com.poc.support.dgTools.utils.AesEncodeUtil;
 import cn.com.yict.framemax.core.exception.BusinessException;
+import cn.com.yict.framemax.data.model.PagingInfo;
 import cn.com.yict.framemax.frame.service.FmxParamConfigService;
 import com.alibaba.fastjson.JSON;
 import org.apache.commons.lang3.StringUtils;
@@ -63,6 +64,19 @@ public class DgtoolsAbstractHttpClient {
      * @param headers         请求头列表
      */
     public <T extends AbstractResult> T doRequest(String url, AbstractRequest<T> abstractRequest, List<Header> headers) {
+        return doRequest(url, abstractRequest, headers, null);
+    }
+
+    /**
+     * 调用中台接口通用请求
+     * <br/>注：基于fastjson对JSON数据转换
+     *
+     * @param url             请求全路径
+     * @param abstractRequest 请求实体，需要继承响应体泛型的AbstractRequest
+     * @param headers         请求头列表
+     * @param pagingInfo      分页信息
+     */
+    public <T extends AbstractResult> T doRequest(String url, AbstractRequest<T> abstractRequest, List<Header> headers, PagingInfo pagingInfo) {
 
 
         Class<T> responseClass = abstractRequest.getResponseClass();
@@ -97,6 +111,11 @@ public class DgtoolsAbstractHttpClient {
                 post.addHeader(header);
             }
         }
+        // 配置分页参数
+        if (pagingInfo != null) {
+            url = url + "?pageSize=" + pagingInfo.getPageSize() + "&pageNo=" + pagingInfo.getPageNo();
+        }
+
         HttpUriRequest httpUriRequest = post
                 .setHeader(DgtoolsApiConstants.JSON_HEADER)
                 .setUri(dgtoolsDomainurl + DgtoolsApiConstants.BASE_URL + url)
@@ -112,6 +131,10 @@ public class DgtoolsAbstractHttpClient {
             //调用服务超时 2000毫秒
             throw new BusinessException(dgtoolsApiResult.getMessage());
         }
+        if (dgtoolsApiResult.getPagingInfo() != null) {
+            pagingInfo.setTotalRows(dgtoolsApiResult.getPagingInfo().getTotalRows());
+            pagingInfo.setPageSize(dgtoolsApiResult.getPagingInfo().getPageSize());
+        }
         return JSON.parseObject(JSON.toJSONString(dgtoolsApiResult.getData()), responseClass);
 
     }

src/main/java/cn/com/poc/support/dgTools/constants/DgtoolsApiConstants.java

@@ -236,11 +236,19 @@ public interface DgtoolsApiConstants {
 
         String BAIDU_HANDWRITING = "aIRest/handWriting.json";
 
+        /**
+         * 知识库
+         */
         String TRAIN_KNOWLEDGE = "knowLedgeRest/trainKnowLedge.json";
 
         String DEL_KNOWLEDGE = "knowLedgeRest/delKnowLedge.json";
 
         String SEARCH_KNOWLEDGE = "knowLedgeRest/searchKnowledge.json";
+        String GET_KNOWLEDGE_CHUNK_INFOS = "/knowLedgeRest/getKnowledgeChunkInfos.json";
+        String OPEN_KNOWLEDGE_CHUNK = "/knowLedgeRest/openKnowledgeChunk.json";
+        String DELETE_KNOWLEDGE_CHUNK = "/knowLedgeRest/deleteKnowledgeChunk.json";
+        String UPDATE_KNOWLEDGE_CHUNK_DOC = "/knowLedgeRest/updateKnowledgeChunkDoc.json";
+        String ADD_KNOWLEDGE_CHUNK = "/knowLedgeRest/addKnowledgeChunk.json";
 
         /**
          * 大模型【通用】
@@ -248,7 +256,7 @@ public interface DgtoolsApiConstants {
         String LARGE_MODEL = "largeModelRest/completion.json";
     }
 
-    interface ClickHouse{
+    interface ClickHouse {
         String WEB_BROWSE_HARVEST_REPORT = "webBrowseHarvest/report.json";
     }
 

src/main/java/cn/com/poc/support/dgTools/result/DgtoolsApiResult.java

 package cn.com.poc.support.dgTools.result;
 
 import cn.com.poc.support.dgTools.constants.ErrorCodeEnum;
+import cn.com.yict.framemax.data.model.PagingInfo;
 
 /**
  * @author Roger Wu
@@ -13,6 +14,16 @@ public class DgtoolsApiResult {
 
     private Object data;
 
+    private PagingInfo pagingInfo;
+
+    public PagingInfo getPagingInfo() {
+        return pagingInfo;
+    }
+
+    public void setPagingInfo(PagingInfo pagingInfo) {
+        this.pagingInfo = pagingInfo;
+    }
+
     public String getCode() {
         return code;
     }

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/aggregate/DemandKnowledgeService.java

 package cn.com.poc.thirdparty.resource.demand.ai.aggregate;
 
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.SegmentationConfigRequest;
+import cn.com.yict.framemax.data.model.PagingInfo;
+
 import java.util.List;
 
 /**
@@ -13,7 +17,7 @@ public interface DemandKnowledgeService {
      * @param fileURL 训练文档
      * @return 知识库id
      */
-    String trainKnowledge(String fileURL);
+    String trainKnowledge(String fileURL, SegmentationConfigRequest segmentationConfig);
 
     /**
      * 删除知识库
@@ -32,4 +36,47 @@ public interface DemandKnowledgeService {
      */
     List<String> searchKnowledge(String query, List<String> knowledgeIds, Integer topK);
 
+    /**
+     * 获取知识库分片
+     *
+     * @param knowledgeIds 知识库id
+     * @param pagingInfo  分页信息
+     */
+    GetKnowledgeChunkInfoResult getKnowledgeChunkInfos(List<String> knowledgeIds, PagingInfo pagingInfo);
+
+    /**
+     * 开关知识库分片
+     *
+     * @param knowledgeId     知识库id
+     * @param chunkRelationId 分片关系id
+     * @param isOpen          是否开启 Y/N
+     */
+    void openKnowledgeChunk(String knowledgeId, String chunkRelationId, String isOpen);
+
+    /**
+     * 删除知识库分片
+     *
+     * @param knowledgeId     知识库id
+     * @param chunkRelationId 分片关系id
+     */
+    void deleteKnowledgeChunk(String knowledgeId, String chunkRelationId);
+
+    /**
+     * 更新知识库分片内容
+     *
+     * @param knowledgeId     知识库id
+     * @param chunkRelationId 分片关系id
+     * @param content         分片内容
+     */
+    void updateKnowledgeChunkDoc(String knowledgeId, String chunkRelationId, String content);
+
+    /**
+     * 新增知识库分片
+     *
+     * @param knowledgeId 知识库id
+     * @param content     分片内容
+     * @param chunkSort   分片排序
+     */
+    void addKnowledgeChunk(String knowledgeId, String content, Integer chunkSort);
+
 }

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/aggregate/impl/DemandKnowledgeServiceImpl.java

 package cn.com.poc.thirdparty.resource.demand.ai.aggregate.impl;
 
-import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
-import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.*;
-import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;
 import cn.com.poc.support.dgTools.DgtoolsAbstractHttpClient;
 import cn.com.poc.support.dgTools.constants.DgtoolsApiConstants;
 import cn.com.poc.support.dgTools.result.AbstractResult;
+import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
+import cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.*;
+import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;
 import cn.com.yict.framemax.core.exception.BusinessException;
+import cn.com.yict.framemax.data.model.PagingInfo;
 import cn.hutool.core.lang.Assert;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.Header;
@@ -27,10 +28,11 @@ public class DemandKnowledgeServiceImpl implements DemandKnowledgeService {
     private DemandAuthService demandAuthService;
 
     @Override
-    public String trainKnowledge(String fileURL) {
+    public String trainKnowledge(String fileURL, SegmentationConfigRequest segmentationConfig) {
         Assert.notBlank(fileURL);
         TrainKnowledgeRequest request = new TrainKnowledgeRequest();
         request.setDocumentUrl(fileURL);
+        request.setSegmentationConfig(segmentationConfig);
         TrainKnowledgeResult trainKnowledgeResult = dgToolsAbstractHttpClient.doRequest(DgtoolsApiConstants.DgtoolsAI.TRAIN_KNOWLEDGE, request, getHeaders());
         if (null == trainKnowledgeResult) {
             throw new BusinessException("train knowledge error");
@@ -51,13 +53,13 @@ public class DemandKnowledgeServiceImpl implements DemandKnowledgeService {
 
     @Override
     public List<String> searchKnowledge(String query, List<String> knowledgeIds, Integer topK) {
+        Assert.notBlank(query);
         if (CollectionUtils.isEmpty(knowledgeIds)) {
             return new ArrayList<String>();
         }
-
-        Assert.notBlank(query);
-        Assert.notNull(topK);
-
+        if (topK == null) {
+            topK = 3;
+        }
         SearchKnowledgeRequest searchKnowledgeRequest = new SearchKnowledgeRequest();
         searchKnowledgeRequest.setQuery(query);
         searchKnowledgeRequest.setKnowLedgeIds(knowledgeIds);
@@ -69,6 +71,48 @@ public class DemandKnowledgeServiceImpl implements DemandKnowledgeService {
         return searchKnowledgeResult.getDocuments();
     }
 
+    @Override
+    public GetKnowledgeChunkInfoResult getKnowledgeChunkInfos(List<String> knowledgeIds, PagingInfo pagingInfo) {
+        GetKnowledgeChunkInfoRequest request = new GetKnowledgeChunkInfoRequest();
+        request.setKnowledgeIds(knowledgeIds);
+        return dgToolsAbstractHttpClient.doRequest(DgtoolsApiConstants.DgtoolsAI.GET_KNOWLEDGE_CHUNK_INFOS, request, getHeaders(), pagingInfo);
+    }
+
+    @Override
+    public void openKnowledgeChunk(String knowledgeId, String chunkRelationId, String isOpen) {
+        UpsertChunkInfoRequest request = new UpsertChunkInfoRequest();
+        request.setKnowledgeId(knowledgeId);
+        request.setChunkRelationId(chunkRelationId);
+        request.setIsOpen(isOpen);
+        dgToolsAbstractHttpClient.doRequest(DgtoolsApiConstants.DgtoolsAI.OPEN_KNOWLEDGE_CHUNK, request, getHeaders());
+    }
+
+    @Override
+    public void deleteKnowledgeChunk(String knowledgeId, String chunkRelationId) {
+        UpsertChunkInfoRequest request = new UpsertChunkInfoRequest();
+        request.setKnowledgeId(knowledgeId);
+        request.setChunkRelationId(chunkRelationId);
+        dgToolsAbstractHttpClient.doRequest(DgtoolsApiConstants.DgtoolsAI.DELETE_KNOWLEDGE_CHUNK, request, getHeaders());
+    }
+
+    @Override
+    public void updateKnowledgeChunkDoc(String knowledgeId, String chunkRelationId, String content) {
+        UpsertChunkInfoRequest request = new UpsertChunkInfoRequest();
+        request.setKnowledgeId(knowledgeId);
+        request.setChunkRelationId(chunkRelationId);
+        request.setChunkContent(content);
+        dgToolsAbstractHttpClient.doRequest(DgtoolsApiConstants.DgtoolsAI.UPDATE_KNOWLEDGE_CHUNK_DOC, request, getHeaders());
+    }
+
+    @Override
+    public void addKnowledgeChunk(String knowledgeId, String content, Integer chunkSort) {
+        UpsertChunkInfoRequest request = new UpsertChunkInfoRequest();
+        request.setKnowledgeId(knowledgeId);
+        request.setChunkSort(chunkSort);
+        request.setChunkContent(content);
+        dgToolsAbstractHttpClient.doRequest(DgtoolsApiConstants.DgtoolsAI.ADD_KNOWLEDGE_CHUNK, request, getHeaders());
+    }
+
     private List<Header> getHeaders() {
         List<Header> headers = new ArrayList<>();
         headers.add(DgtoolsApiConstants.JSON_HEADER);

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/ChunkInfo.java

+package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
+
+public class ChunkInfo {
+
+    private String knowledgeId;
+    private String chunkContent;
+
+
+    private String chunkRelationId;
+
+    private Integer chunkSort;
+
+    private String isOpen;
+
+    public String getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(String isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    public String getKnowledgeId() {
+        return knowledgeId;
+    }
+
+    public void setKnowledgeId(String knowledgeId) {
+        this.knowledgeId = knowledgeId;
+    }
+
+    public String getChunkContent() {
+        return chunkContent;
+    }
+
+    public void setChunkContent(String chunkContent) {
+        this.chunkContent = chunkContent;
+    }
+
+    public String getChunkRelationId() {
+        return chunkRelationId;
+    }
+
+    public void setChunkRelationId(String chunkRelationId) {
+        this.chunkRelationId = chunkRelationId;
+    }
+
+    public Integer getChunkSort() {
+        return chunkSort;
+    }
+
+    public void setChunkSort(Integer chunkSort) {
+        this.chunkSort = chunkSort;
+    }
+
+    @Override
+    public String toString() {
+        return "ChunkInfo{" +
+                "chunkContent='" + chunkContent + '\'' +
+                ", chunkRelationId='" + chunkRelationId + '\'' +
+                ", chunkSort=" + chunkSort +
+                '}';
+    }
+}

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/GetKnowledgeChunkInfoRequest.java

+package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
+
+import cn.com.poc.support.dgTools.request.AbstractRequest;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class GetKnowledgeChunkInfoRequest extends AbstractRequest<GetKnowledgeChunkInfoResult> implements Serializable {
+
+    private List<String> knowledgeIds;
+
+    public List<String> getKnowledgeIds() {
+        return knowledgeIds;
+    }
+
+    public void setKnowledgeIds(List<String> knowledgeIds) {
+        this.knowledgeIds = knowledgeIds;
+    }
+
+    @Override
+    public String getMethod() throws Exception {
+        return null;
+    }
+}

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/GetKnowledgeChunkInfoResult.java

+package cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge;
+
+import cn.com.poc.support.dgTools.result.AbstractResult;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class GetKnowledgeChunkInfoResult extends AbstractResult implements Serializable {
+
+    private static final long serialVersionUID = 11243413567468L;
+
+    private List<ChunkInfo> chunkInfos;
+
+
+    public List<ChunkInfo> getChunkInfos() {
+        return chunkInfos;
+    }
+
+    public void setChunkInfos(List<ChunkInfo> chunkInfos) {
+        this.chunkInfos = chunkInfos;
+    }
+
+    @Override
+    public String toString() {
+        return "{" +
+                "chunkInfos:" + chunkInfos +
+                '}';
+    }
+}

src/main/java/cn/com/poc/thirdparty/resource/demand/ai/entity/knowledge/TrainKnowledgeRequest.java

@@ -8,6 +8,16 @@ public class TrainKnowledgeRequest extends AbstractRequest<TrainKnowledgeResult>
 
     private String documentUrl;
 
+    private SegmentationConfigRequest segmentationConfig;
+
+    public SegmentationConfigRequest getSegmentationConfig() {
+        return segmentationConfig;
+    }
+
+    public void setSegmentationConfig(SegmentationConfigRequest segmentationConfig) {
+        this.segmentationConfig = segmentationConfig;
+    }
+
     public String getDocumentUrl() {
         return documentUrl;
     }

src/test/java/cn/com/poc/AgentApplicationInfoTest.java

@@ -2,7 +2,10 @@ package cn.com.poc;
 
 
 import cn.com.poc.agent_application.aggregate.AgentApplicationInfoService;
+import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
 import cn.com.yict.framemax.core.spring.SingleContextInitializer;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.ListUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -10,6 +13,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(initializers = SingleContextInitializer.class)
@@ -20,6 +27,9 @@ public class AgentApplicationInfoTest {
     @Resource
     private AgentApplicationInfoService applicationInfoService;
 
+    @Resource
+    private DemandKnowledgeService demandKnowledgeService;
+
     /**
      * Agent 应用标题，描述生成
      */
@@ -28,4 +38,12 @@ public class AgentApplicationInfoTest {
         String input = "测试标题";
         System.out.println(applicationInfoService.createAgentTitleAndDesc(input));
     }
+
+    @Test
+    public void knowledgeTest() {
+        ArrayList<String> list = new ArrayList<String>() {{
+        }};
+        System.out.println(list.toString());
+    }
+
 }