fix: 知识库训练状态更新修复

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

@@ -179,6 +179,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             message.setKid(kdId);
             message.setFileUrl(bizKnowledgeDocumentEntity.getDocumentUrl());
             message.setSegmentationConfig(segmentationConfig);
+            message.setKnowledgeInfoId(knowledgeInfoId);
             knowledgeProducerService.trainKnowledge(message);
         }
 

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

@@ -14,7 +14,7 @@ public class BizKnowledgeInfoConvert {
         entity.setMemberId(model.getMemberId());
         entity.setKdIds(model.getKdIds());
         entity.setTrainStatus(model.getTrainStatus());
-        entity.setDesc(model.getDesc());
+        entity.setKnowledgeDesc(model.getKnowledgeDesc());
         entity.setIsDeleted(model.getIsDeleted());
         entity.setCreator(model.getCreator());
         entity.setCreatedTime(model.getCreatedTime());
@@ -31,7 +31,7 @@ public class BizKnowledgeInfoConvert {
         model.setMemberId(entity.getMemberId());
         model.setKdIds(entity.getKdIds());
         model.setTrainStatus(entity.getTrainStatus());
-        model.setDesc(entity.getDesc());
+        model.setKnowledgeDesc(entity.getKnowledgeDesc());
         model.setIsDeleted(entity.getIsDeleted());
         model.setCreator(entity.getCreator());
         model.setCreatedTime(entity.getCreatedTime());
@@ -48,7 +48,7 @@ public class BizKnowledgeInfoConvert {
         dto.setMemberId(entity.getMemberId());
         dto.setKdIds(entity.getKdIds());
         dto.setTrainStatus(entity.getTrainStatus());
-        dto.setDesc(entity.getDesc());
+        dto.setDesc(entity.getKnowledgeDesc());
         return dto;
     }
 
@@ -59,7 +59,7 @@ public class BizKnowledgeInfoConvert {
         entity.setMemberId(dto.getMemberId());
         entity.setKdIds(dto.getKdIds());
         entity.setTrainStatus(dto.getTrainStatus());
-        entity.setDesc(dto.getDesc());
+        entity.setKnowledgeDesc(dto.getDesc());
         return entity;
     }
 }
\ No newline at end of file

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

@@ -64,18 +64,19 @@ public class BizKnowledgeInfoEntity {
     public void setTrainStatus(java.lang.String trainStatus){
         this.trainStatus = trainStatus;
     }
-	/** desc
+	/** knowledgeDesc
     *
     */ 
-    private java.lang.String desc;
+    private java.lang.String knowledgeDesc;
 
-    public java.lang.String getDesc(){
-        return this.desc;
+    public String getKnowledgeDesc() {
+        return knowledgeDesc;
     }
 
-    public void setDesc(java.lang.String desc){
-        this.desc = desc;
+    public void setKnowledgeDesc(String knowledgeDesc) {
+        this.knowledgeDesc = knowledgeDesc;
     }
+
     /** is_deleted
     *是否删除 Y 是  N 否
     */ 

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

@@ -106,19 +106,19 @@ public class BizKnowledgeInfoModel extends BaseModelClass implements Serializabl
     }
     
   
-    /** desc
+    /** knowledge_desc
     *
     */ 
-    private java.lang.String desc;
+    private java.lang.String knowledgeDesc;
     
-    @Column(name = "desc",length = 500)
-    public java.lang.String getDesc(){
-        return this.desc;
+    @Column(name = "knowledge_desc",length = 500)
+    public java.lang.String getKnowledgeDesc(){
+        return this.knowledgeDesc;
     }
     
-    public void setDesc(java.lang.String desc){
-        this.desc = desc;
-        super.addValidField("desc");
+    public void setKnowledgeDesc(java.lang.String knowledgeDesc){
+        this.knowledgeDesc = knowledgeDesc;
+        super.addValidField("knowledgeDesc");
     }
     
   

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

@@ -78,6 +78,11 @@ public interface KnowledgeRest extends BaseRest {
      */
     BizKnowledgeInfoDto createKnowledge(@RequestBody BizKnowledgeInfoDto dto) throws Exception;
 
+    /**
+     * 更新知识库
+     */
+    BizKnowledgeInfoDto updateKnowledgeInfo(@RequestBody BizKnowledgeInfoDto dto) throws Exception;
+
     /**
      * 开关知识库分片
      */

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

@@ -130,17 +130,29 @@ public class KnowledgeRestImpl implements KnowledgeRest {
 
     @Override
     public BizKnowledgeInfoDto createKnowledge(BizKnowledgeInfoDto dto) throws Exception {
-        Assert.notNull(dto.getKnowledgeName());
+        Assert.notNull(dto.getKnowledgeName(), "知识库名称不能为空");
         UserBaseEntity userBaseEntity = BlContext.getCurrentUserNotException();
         BizKnowledgeInfoEntity bizKnowledgeInfoEntity = new BizKnowledgeInfoEntity();
         bizKnowledgeInfoEntity.setKnowledgeName(dto.getKnowledgeName());
         bizKnowledgeInfoEntity.setMemberId(userBaseEntity.getUserId().toString());
         bizKnowledgeInfoEntity.setTrainStatus(KnowledgeConstant.TrainStatus.UNOPENED);
-        bizKnowledgeInfoEntity.setDesc(dto.getDesc());
+        bizKnowledgeInfoEntity.setKnowledgeDesc(dto.getDesc());
         BizKnowledgeInfoEntity entity = bizKnowledgeInfoService.save(bizKnowledgeInfoEntity);
         return BizKnowledgeInfoConvert.entityToDto(entity);
     }
 
+    @Override
+    public BizKnowledgeInfoDto updateKnowledgeInfo(BizKnowledgeInfoDto dto) throws Exception {
+        Assert.notNull(dto.getId());
+        Assert.notBlank(dto.getKnowledgeName(), "知识库名称不能为空");
+        BizKnowledgeInfoEntity bizKnowledgeInfoEntity = new BizKnowledgeInfoEntity();
+        bizKnowledgeInfoEntity.setId(dto.getId());
+        bizKnowledgeInfoEntity.setKnowledgeName(dto.getKnowledgeName());
+        bizKnowledgeInfoEntity.setKnowledgeDesc(dto.getDesc());
+        BizKnowledgeInfoEntity entity = bizKnowledgeInfoService.update(bizKnowledgeInfoEntity);
+        return BizKnowledgeInfoConvert.entityToDto(entity);
+    }
+
     @Override
     public void openKnowledgeChunk(UpsertChunkInfoDto dto) {
         Assert.notNull(dto.getIsOpen());

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

@@ -80,24 +80,12 @@ public class BizKnowledgeInfoServiceImpl extends BaseServiceImpl
         if (entity.getTrainStatus() != null) {
             model.setTrainStatus(entity.getTrainStatus());
         }
-        if (entity.getDesc() != null) {
-            model.setDesc(entity.getDesc());
+        if (entity.getKnowledgeDesc() != null) {
+            model.setKnowledgeDesc(entity.getKnowledgeDesc());
         }
         if (entity.getIsDeleted() != null) {
             model.setIsDeleted(entity.getIsDeleted());
         }
-        if (entity.getCreator() != null) {
-            model.setCreator(entity.getCreator());
-        }
-        if (entity.getCreatedTime() != null) {
-            model.setCreatedTime(entity.getCreatedTime());
-        }
-        if (entity.getModifier() != null) {
-            model.setModifier(entity.getModifier());
-        }
-        if (entity.getModifiedTime() != null) {
-            model.setModifiedTime(entity.getModifiedTime());
-        }
         if (entity.getSysVersion() != null) {
             model.setSysVersion(entity.getSysVersion());
         }

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

@@ -63,6 +63,7 @@ public class KnowledgeConsumerServiceImpl implements KnowledgeConsumerService {
         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(), message.getSegmentationConfig());