add delete

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 知识
@@ -88,11 +89,12 @@ public class KnowledgeController {
 
         Map<String,MultipartFile> fileMap = multipartRequest.getFileMap();
         List<Result<KnowFile>> resultList = localFileService.upload(fileMap);
-
-//        if(null==upload||upload.getResult()==null){
-//            return Result.error("上传文件失败");
-//        }
-        //knowledgeService.addKnowledge(upload.getResult(),knowledge);
+        if(null==resultList||resultList.isEmpty()){
+            return Result.error("上传文件失败");
+        }
+        for (Result<KnowFile> knowFileResult : resultList) {
+            knowledgeService.addKnowledge(knowFileResult.getResult(),knowledge);
+        }
         return Result.OK("添加成功！");
     }
 
@@ -112,12 +114,12 @@ public class KnowledgeController {
     /**
      * 通过id删除
      *
-     * @param id
+     * @param ids
      * @return
      */
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id") String id) {
-        knowledgeService.deleteKnowledge(id);
+    public Result<?> delete(@RequestParam(name = "id") String ids) {
+        knowledgeService.deleteKnowledge(ids);
         return Result.OK("删除成功!");
     }
     /**

src/main/java/com/zzsn/knowbase/entity/Knowledge.java

@@ -78,6 +78,9 @@ public class Knowledge implements Serializable {
      * 发布时间
      */
     private String publishDate;
+    /**
+     * 审核时间
+     */
     private String verifyTime;
     /**
      * 审核状态

src/main/java/com/zzsn/knowbase/service/IKnowledgeService.java

@@ -30,7 +30,7 @@ public interface IKnowledgeService {
     /**
      * 删除
      */
-    void deleteKnowledge(String id) ;
+    void deleteKnowledge(String ids) ;
 
     /**
      * 分页检索

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -66,6 +66,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     private ProduceInfo produceInfo;
     @Value("${python.searchUrl:}")
     private String searchUrl;
+    @Value("${python.delete:}")
+    private String deleteUrl;
 
     @Autowired
     private RedisUtil redisUtil;
@@ -107,8 +109,9 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         knowledge.setContents(contentList);
         esOpUtil.docSavaByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, knowledge.getId(), knowledge);
 
+        //删除
+        deleteForPython(knowledge.getId());
         KnowledgeMessage knowledgeMessage = new KnowledgeMessage();
-
         BeanUtils.copyProperties(knowledge, knowledgeMessage);
 //        CleanerProperties props = new CleanerProperties();
 //        props.setPruneTags("table");
@@ -134,8 +137,24 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     }
 
     @Override
-    public void deleteKnowledge(String id) {
-        esOpUtil.docDeleteById(Constants.ES_DATA_FOR_KNOWLEDGE, id);
+    public void deleteKnowledge(String ids) {
+        String[] split = ids.split(",");
+        for (String id : split) {
+            esOpUtil.docDeleteById(Constants.ES_DATA_FOR_KNOWLEDGE, id);
+            deleteForPython(id);
+        }
+
+    }
+
+    public void deleteForPython(String id) {
+        JSONObject params = new JSONObject();
+        params.put("knowledge_base_id",id);
+        try {
+            HttpUtil.doPost(deleteUrl, params, 120000);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
     }
 
     @Override

src/main/java/com/zzsn/knowbase/vo/KnowledgeVO.java

 package com.zzsn.knowbase.vo;
 
-import com.zzsn.knowbase.entity.Knowledge;
 import lombok.Builder;
 import lombok.Data;
 

src/main/resources/application.yml

@@ -43,6 +43,7 @@ mybatis-plus:
 python:
   intelligentQaUrl: http://116.63.179.212:7862/platform/chat
   searchUrl: http://114.115.172.99:10013/platform/search
+  deleteUrl: http://114.115.172.99:10013/platform/delete
 
 know:
   thirdpartyurl: