dispatch interface

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

@@ -105,6 +105,7 @@ public class KnowledgeController {
     @PostMapping(value = "/uploadKnowledge")
     public Result<?> uploadKnowledge(HttpServletRequest request, Knowledge knowledge) {
         MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class);
+
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         Result<List<KnowFile>> result = localFileService.upload(fileMap);
         if(!Integer.valueOf("200").equals(result.getCode())){

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

@@ -11,8 +11,8 @@ import com.zzsn.knowbase.entity.*;
 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.KbAuthorizedUserService;
 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;
@@ -66,7 +66,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
     @Autowired
     private KbKnowledgeProjectService knowledgeProjectService;
     @Autowired
-    private KbKnowledgeProjectTypeService kbKnowledgeProjectTypeService;
+    private KbAuthorizedUserService authorizedUserService;
     @Autowired
     private ProduceInfo produceInfo;
     @Value("${python.searchUrl:}")
@@ -213,27 +213,21 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         }
         //查看全部且是非管理员的时候
         if ((!Integer.valueOf("0").equals(userInfo.getIsAll())) && knowledgeParam.getKnowledgeProjectId().equals("0")) {
-            List<KbAuthuserKnowledgeprojectMap> permitKnowProjectList = knowledgeProjectService.getKnowledgeProjectListByUserId(userInfo.getId());
+            Map<String, Boolean> userKnowProjectSigns = authorizedUserService.getUserKnowProjectSigns(treeList, userInfo.getId());
             //all permit
-            List<String> allPermitList = permitKnowProjectList.stream()
-                    .filter(item -> item.getSign() == 0)
-                    .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
-                    .collect(Collectors.toList());
+            Set<Map.Entry<String, Boolean>> entries = userKnowProjectSigns.entrySet();
+            List<String> allPermitList = entries.stream().filter(Map.Entry::getValue).map(Map.Entry::getKey).collect(Collectors.toList());
+            List<String> halfPermitList = entries.stream().filter(item->!item.getValue()).map(Map.Entry::getKey).collect(Collectors.toList());
             //know permit
-            List<String> knowPermitList = permitKnowProjectList.stream()
-                    .filter(item -> item.getSign() == 1)
-                    .map(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId)
-                    .collect(Collectors.toList());
+            List<String> knowPermitList  = authorizedUserService.getUserPermissionKnowsByIds(halfPermitList, userInfo.getId());
 
             if (!knowPermitList.isEmpty()) {
                 permitKnowList = knowledgeProjectService.getKnowledgeListByUserId(userInfo.getId(), knowPermitList);
             }
-
             catList = (List<String>) CollectionUtils.intersection(treeList, allPermitList);
         } else {
             catList = treeList;
         }
-
         SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_KNOWLEDGE);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //设置分页参数