fix

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

@@ -28,7 +28,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -66,17 +69,18 @@ public class KnowledgeController {
         IPage<KnowledgeVO> pageList = knowledgeService.queryPageList(knowledgeParam, pageNo, pageSize, column, order);
         return Result.OK(pageList);
     }
+
     /**
      * 详情
      */
     @GetMapping(value = "/getById")
-    public Result<?> getById(@RequestParam String id)  {
-        log.info("{}===query begin",new Date());
-        KnowledgeVO knowledgeVO=knowledgeService.getById(id);
-        if(null!=knowledgeVO.getPublishDate()&&(!knowledgeVO.getPublishDate().isEmpty())){
+    public Result<?> getById(@RequestParam String id) {
+        log.info("{}===query begin", new Date());
+        KnowledgeVO knowledgeVO = knowledgeService.getById(id);
+        if (null != knowledgeVO.getPublishDate() && (!knowledgeVO.getPublishDate().isEmpty())) {
             knowledgeVO.setPublishDate(EsDateUtil.esFieldDateMapping(knowledgeVO.getPublishDate()));
         }
-        if(null!=knowledgeVO.getVerifyTime()&&(!knowledgeVO.getVerifyTime().isEmpty())){
+        if (null != knowledgeVO.getVerifyTime() && (!knowledgeVO.getVerifyTime().isEmpty())) {
             knowledgeVO.setVerifyTime(EsDateUtil.esFieldDateMapping(knowledgeVO.getVerifyTime()));
         }
         return Result.OK(knowledgeVO);
@@ -106,24 +110,26 @@ public class KnowledgeController {
 
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         Result<List<KnowFile>> result = localFileService.upload(fileMap);
-        if(!Integer.valueOf("200").equals(result.getCode())){
+        log.info("upload result:{}", result);
+        if (!Integer.valueOf("200").equals(result.getCode())) {
             return Result.error(result.getMessage());
         }
         List<KnowFile> resultList = result.getResult();
         KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
         knowledge.setImportData(0);
-        CompletableFuture.runAsync(()-> this.add(resultList,knowledge,userInfo));
+        CompletableFuture.runAsync(() -> this.add(resultList, knowledge, userInfo));
         return Result.OK("添加成功！");
     }
-    private void add( List<KnowFile> resultList, Knowledge knowledge,KbAuthorizedUser userInfo){
+
+    private void add(List<KnowFile> resultList, Knowledge knowledge, KbAuthorizedUser userInfo) {
 
         if (null == resultList || resultList.isEmpty()) {
-            return ;
+            return;
         }
-        for ( KnowFile knowFileResult : resultList) {
+        for (KnowFile knowFileResult : resultList) {
             knowledge.setId(null);
             knowledge.setTitle(null);
-            knowledgeService.addKnowledge(knowFileResult, knowledge,userInfo);
+            knowledgeService.addKnowledge(knowFileResult, knowledge, userInfo);
         }
     }
 
@@ -147,10 +153,11 @@ public class KnowledgeController {
      * @return
      */
     @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "ids") String ids) {
-         knowledgeService.deleteKnowledge(ids);
+    public Result<?> delete(@RequestParam(name = "ids") String ids,@RequestParam(name = "knowledgeBaseId") String knowledgeBaseId) {
+        knowledgeService.deleteKnowledge(ids,knowledgeBaseId);
         return Result.OK("删除成功!");
     }
+
     @GetMapping(value = "/parse")
     public Result<?> parse(@RequestParam(name = "filePath") String filePath) throws IOException {
         String s = DocUtil.docParseHtml(filePath);
@@ -166,7 +173,7 @@ public class KnowledgeController {
     @PostMapping(value = "/IntelligentQa")
     public Result<?> intelligentQa(@RequestBody IntelligentQaParam intelligentQaParam) throws IOException {
         JSONObject params = new JSONObject();
-        params.put("score_threshold",intelligentQaParam.getScoreThreshold() );
+        params.put("score_threshold", intelligentQaParam.getScoreThreshold());
         params.put("question", intelligentQaParam.getQuestion());
         params.put("knowledge_base_id", intelligentQaParam.getKbKnowledgeIds().split(","));
         String result = HttpUtil.doPost(intelligentQaUrl, params, 120000);
@@ -186,9 +193,10 @@ public class KnowledgeController {
     public Result<?> importInfo(HttpServletRequest request, HttpServletResponse response) {
         KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
         assert userInfo != null;
-        knowledgeService.doImportInfo(request,userInfo.getId());
+        knowledgeService.doImportInfo(request, userInfo.getId());
         return Result.OK("导入正在后台进行");
     }
+
     /**
      * 下载导入模板
      */

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

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

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

@@ -46,7 +46,10 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -226,7 +229,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             esOpUtil.docEditByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, knowledge.getId(), knowledge);
         }
         //删除
-        deleteForPython(knowledge.getId());
+        deleteForPython(knowledge.getId(),knowledge.getKnowledgeProjectId());
 
         BeanUtils.copyProperties(knowledge, knowledgeMessage);
         knowledgeMessage.setType(knowledge.getTypeId());
@@ -240,7 +243,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     }
 
     @Override
-    public void deleteKnowledge(String ids) {
+    public void deleteKnowledge(String ids,String knowledgeBaseId) {
         String[] split = ids.split(",");
         for (String id : split) {
             esOpUtil.docDeleteById(Constants.ES_DATA_FOR_KNOWLEDGE, id);
@@ -248,16 +251,19 @@ class KnowledgeServiceImpl implements IKnowledgeService {
 
         CompletableFuture.runAsync(() -> {
             for (String id : split) {
-                deleteForPython(id);
+                deleteForPython(id,knowledgeBaseId);
             }
         });
 
 
     }
 
-    public void deleteForPython(String id) {
+    public void deleteForPython(String id,String knowledgeBaseId) {
         JSONObject params = new JSONObject();
-        params.put("knowledge_base_id", id);
+        List <String > lidList=new ArrayList<>();
+        lidList.add(id);
+        params.put("id", lidList);
+        params.put("knowledge_base_id", knowledgeBaseId);
         try {
             HttpUtil.doPost(deleteUrl, params, 120000);
         } catch (IOException e) {