adjust python

src/main/java/com/zzsn/knowbase/kafka/message/KnowledgeMessage.java

@@ -48,6 +48,7 @@ public class KnowledgeMessage {
      * 类型
      */
     private String type;
+    private String author;
 
     private List<Content> contents;
 

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

 package com.zzsn.knowbase.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.obs.services.model.PutObjectResult;
 import com.zzsn.knowbase.constant.Constants;
 import com.zzsn.knowbase.entity.*;
-import com.zzsn.knowbase.enums.KnowTypeEnum;
 import com.zzsn.knowbase.kafka.message.KnowledgeMessage;
 import com.zzsn.knowbase.kafka.producer.ProduceInfo;
 import com.zzsn.knowbase.service.IKnowledgeService;
 import com.zzsn.knowbase.service.KbKnowledgeProjectService;
+import com.zzsn.knowbase.service.KbKnowledgeProjectTypeService;
 import com.zzsn.knowbase.util.*;
 import com.zzsn.knowbase.vo.KnowledgeParam;
 import com.zzsn.knowbase.vo.KnowledgeVO;
@@ -68,6 +65,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     @Autowired
     private KbKnowledgeProjectService knowledgeProjectService;
     @Autowired
+    private KbKnowledgeProjectTypeService kbKnowledgeProjectTypeService;
+    @Autowired
     private ProduceInfo produceInfo;
     @Value("${python.searchUrl:}")
     private String searchUrl;
@@ -155,6 +154,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         deleteForPython(knowledge.getId());
         KnowledgeMessage knowledgeMessage = new KnowledgeMessage();
         BeanUtils.copyProperties(knowledge, knowledgeMessage);
+        knowledgeMessage.setType(knowledge.getTypeId());
 //        CleanerProperties props = new CleanerProperties();
 //        props.setPruneTags("table");
 //        String htmlWithoutTable = new HtmlCleaner(props).clean(html).getText().toString();
@@ -371,7 +371,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             if (null == userInfo) {
                 return null;
             }
-            if (Integer.valueOf("0").equals(userInfo.getIsAll())) {
+            if (!Integer.valueOf("0").equals(userInfo.getIsAll())) {
                 List<KbAuthuserKnowledgeprojectMap> permitKnowProjectList = knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
                 //all permit
                 List<String> allPermitList = permitKnowProjectList.stream()
@@ -383,19 +383,16 @@ class KnowledgeServiceImpl implements IKnowledgeService {
                         .filter(item -> item.getSign() == 1)
                         .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
                         .collect(Collectors.toList());
-                permitKnowList = knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(), knowPermitList);
+                if (!knowPermitList.isEmpty()) {
+                    permitKnowList = knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(), knowPermitList);
+                }
                 catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
             } else {
                 catList = treeList;
             }
-            StringBuilder typeNames = new StringBuilder();
-            if (null != knowledgeParam.getTypeIds()) {
-                for (String type : knowledgeParam.getTypeIds().split(",")) {
-                    typeNames.append(KnowTypeEnum.getByType(type).getDes()).append(",");
-                }
-            }
+            List<String> split = Arrays.asList(knowledgeParam.getTypeIds().split(","));
             JSONObject params = new JSONObject();
-            params.put("type", typeNames);
+            params.put("type", split);
             params.put("startTime", knowledgeParam.getStartTime());
             params.put("endTime", knowledgeParam.getEndTime());
             params.put("author", knowledgeParam.getAuthor());
@@ -403,7 +400,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             params.put("verifierName", knowledgeParam.getVerifierName());
             params.put("verifyStatus", knowledgeParam.getVerifyStatus());
             params.put("verifyStartTime", knowledgeParam.getVerifyStartTime());
-//            params.put("knowledge_base_id", treeList);
+            params.put("knowledge_base_id", knowledgeParam.getKbKnowledgeId().split(","));
             params.put("id", permitKnowList);
             params.put("knowledgeProjectId", catList);
             params.put("verifyEndTime", knowledgeParam.getVerifyEndTime());
@@ -419,12 +416,12 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            if (result == null || !result.contains("results")) {
+            if (result == null || !result.contains("result")) {
                 return null;
             }
             JSONObject jsonObject = JSONObject.parseObject(result);
-            data = jsonObject.get("results");
-            redisUtil.set(genKey(knowledgeParam), data, 100000000);
+            data = jsonObject.get("result");
+            redisUtil.set(genKey(knowledgeParam), data, 1);
         }
         JSONArray jsonArray = JSONObject.parseArray(data.toString());
         List<KnowledgeVO> knowledgeList = new ArrayList<>(jsonArray.size());
@@ -432,6 +429,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             JSONObject one = JSONObject.parseObject(o.toString());
             knowledgeList.add(KnowledgeVO.builder()
                     .id((String) one.get("id"))
+                    .title((String) one.get("title"))
+                    .author((String) one.get("author"))
                     .score((int) one.get("score"))
                     .verifyStatus("".equals(one.get("verifyStatus")) ? 0 : Integer.parseInt(one.get("verifyStatus").toString()))
                     .verifyTime(one.get("verifyTime").toString())
@@ -491,17 +490,17 @@ class KnowledgeServiceImpl implements IKnowledgeService {
 
             List<List<String>> lists = ExcelExportUtil.readExcel(new ByteArrayInputStream(fileData), 1, 9);
             //存入es
-            importInfo(lists, kbKnowledgeId, knowledgeProjectId, typeId,createBy);
+            importInfo(lists, kbKnowledgeId, knowledgeProjectId, typeId, createBy);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     //导入发布库数据
-    public void importInfo(List<List<String>> lists, String kbKnowledgeId, String knowledgeProjectId, String typeId,String createBy ) {
+    public void importInfo(List<List<String>> lists, String kbKnowledgeId, String knowledgeProjectId, String typeId, String createBy) {
         for (List<String> info : lists) {
             try {
-                Knowledge specialInformation =  Knowledge.builder()
+                Knowledge specialInformation = Knowledge.builder()
                         .kbKnowledgeId(kbKnowledgeId)
                         .knowledgeProjectId(knowledgeProjectId)
                         .typeId(typeId)