Merge remote-tracking branch 'origin/master'

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

@@ -126,7 +126,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
                 .filter(item -> !item.getContent().contains("<td>"))
                 .filter(item -> !item.getContent().contains("</td>"))
                 .collect(Collectors.toList());
-        messageContentList.forEach(item->item.setContent(Jsoup.parse(item.getContent()).text()));
+        messageContentList.forEach(item -> item.setContent(Jsoup.parse(item.getContent()).text()));
         knowledgeMessage.setContents(messageContentList);
         produceInfo.sendKnowledgeContents(knowledgeMessage);
     }
@@ -160,37 +160,37 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     @Override
     public IPage<KnowledgeVO> queryPageList(KnowledgeParam knowledgeParam, Integer pageNo, Integer pageSize, String column, String order) {
 
-        List<String> permitKnowList=new ArrayList<>();
+        List<String> permitKnowList = new ArrayList<>();
         List<String> catList;
         List<String> treeList = knowledgeProjectService.getTreeListBy(knowledgeParam.getKnowledgeProjectId())
                 .stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
         //获取用户拥有的分类
         KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
-        if(null==userInfo){
+        if (null == userInfo) {
             return null;
         }
         //查看全部且是非管理员的时候
-       if((!Integer.valueOf("0").equals(userInfo.getIsAll()))&&knowledgeParam.getKnowledgeProjectId().equals("0")){
-        List<KbAuthuserKnowledgeprojectMap>  permitKnowProjectList=knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
-        //all permit
-        List<String > allPermitList=permitKnowProjectList.stream()
-                .filter(item->item.getSign()==0)
-                .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
-                .collect(Collectors.toList());
-        //know permit
-        List<String > knowPermitList=permitKnowProjectList.stream()
-                .filter(item->item.getSign()==1)
-                .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
-                .collect(Collectors.toList());
+        if ((!Integer.valueOf("0").equals(userInfo.getIsAll())) && knowledgeParam.getKnowledgeProjectId().equals("0")) {
+            List<KbAuthuserKnowledgeprojectMap> permitKnowProjectList = knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
+            //all permit
+            List<String> allPermitList = permitKnowProjectList.stream()
+                    .filter(item -> item.getSign() == 0)
+                    .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
+                    .collect(Collectors.toList());
+            //know permit
+            List<String> knowPermitList = permitKnowProjectList.stream()
+                    .filter(item -> item.getSign() == 1)
+                    .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
+                    .collect(Collectors.toList());
 
-        if(!knowPermitList.isEmpty()){
-            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;
-       }
+            catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
+        } else {
+            catList = treeList;
+        }
 
         SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_KNOWLEDGE);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
@@ -200,21 +200,18 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         //默认按照置顶以及时间倒序排列
         //根据topNum正序查找，查询置顶数据
         searchSourceBuilder.sort("publishDate", SortOrder.DESC);
-        if ("score".equals(column)) {
-            if ("asc".equals(order)) {
-                searchSourceBuilder.sort("score", SortOrder.ASC);
-                searchSourceBuilder.sort("publishDate", SortOrder.ASC);
-            } else if ("desc".equals(order)) {
-                searchSourceBuilder.sort("score", SortOrder.DESC);
-                searchSourceBuilder.sort("publishDate", SortOrder.DESC);
-            }
-        } else if ("publishDate".equals(column)) {
+        if ("publishDate".equals(column)) {
             if ("desc".equals(order)) {
                 searchSourceBuilder.sort("publishDate", SortOrder.DESC);
-                searchSourceBuilder.sort("score", SortOrder.DESC);
             } else if ("asc".equals(order)) {
                 searchSourceBuilder.sort("publishDate", SortOrder.ASC);
-                searchSourceBuilder.sort("score", SortOrder.ASC);
+            }
+        }
+        if ("verifyTime".equals(column)) {
+            if ("desc".equals(order)) {
+                searchSourceBuilder.sort("verifyTime", SortOrder.DESC);
+            } else if ("asc".equals(order)) {
+                searchSourceBuilder.sort("verifyTime", SortOrder.ASC);
             }
         }
         //默认最大数量是10000，设置为true后，显示准确数量
@@ -280,7 +277,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         }
 
         if (StringUtils.isNotEmpty(knowledgeParam.getId())) {
-            boolQuery.must(QueryBuilders.termsQuery("id",permitKnowList));
+            boolQuery.must(QueryBuilders.termsQuery("id", permitKnowList));
         }
         if (!catList.isEmpty()) {
             boolQuery.must(QueryBuilders.termsQuery("knowledgeProjectId", catList));
@@ -301,7 +298,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         searchRequest.source(searchSourceBuilder);
         SearchResponse searchResponse = null;
         try {
-                searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
+            searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -327,29 +324,29 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         if (org.springframework.util.StringUtils.isEmpty(data)) {
             List<String> treeList = knowledgeProjectService.getTreeListBy(knowledgeParam.getKnowledgeProjectId())
                     .stream().map(KbKnowledgeProject::getId).collect(Collectors.toList());
-            List<String> permitKnowList=new ArrayList<>();
-            List<String> catList=new ArrayList<>();
+            List<String> permitKnowList = new ArrayList<>();
+            List<String> catList = new ArrayList<>();
             KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
-            if(null==userInfo){
+            if (null == userInfo) {
                 return null;
             }
-            if(Integer.valueOf("0").equals(userInfo.getIsAll())){
-            List<KbAuthuserKnowledgeprojectMap>  permitKnowProjectList=knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
-            //all permit
-            List<String > allPermitList=permitKnowProjectList.stream()
-                    .filter(item->item.getSign()==0)
-                    .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
-                    .collect(Collectors.toList());
-            //know permit
-            List<String > knowPermitList=permitKnowProjectList.stream()
-                    .filter(item->item.getSign()==1)
-                    .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
-                    .collect(Collectors.toList());
-            permitKnowList=knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(),knowPermitList);
-           catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
-           }else {
-               catList=treeList;
-           }
+            if (Integer.valueOf("0").equals(userInfo.getIsAll())) {
+                List<KbAuthuserKnowledgeprojectMap> permitKnowProjectList = knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
+                //all permit
+                List<String> allPermitList = permitKnowProjectList.stream()
+                        .filter(item -> item.getSign() == 0)
+                        .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
+                        .collect(Collectors.toList());
+                //know permit
+                List<String> knowPermitList = permitKnowProjectList.stream()
+                        .filter(item -> item.getSign() == 1)
+                        .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
+                        .collect(Collectors.toList());
+                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(",")) {

src/main/resources/application.yml

@@ -46,7 +46,7 @@ mybatis-plus:
 python:
   intelligentQaUrl: http://116.63.179.212:7862/platform/chat
   searchUrl: http://116.63.179.212:7862/platform/searchInfo
-  deleteUrl: http://114.115.172.99:10013/platform/delete
+  deleteUrl: http://116.63.179.212:7863/platform/delete
 
 know:
   thirdpartyurl: