Merge remote-tracking branch 'origin/master'

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

@@ -38,6 +38,9 @@ public class KbAuthorizedUserController {
         return authorizedUserService.addOne(authorizedUser);
     }
 
+    /**
+     * 添加授权用户，对某个知识库分类下添加一个或者多个授权用户
+     * */
     @PostMapping("/add")
     public Result<?> add(@RequestBody List<KbAuthorizedUser> authorizedUser){
         return authorizedUserService.add(authorizedUser);
@@ -102,5 +105,19 @@ public class KbAuthorizedUserController {
         return authorizedUserService.thirdpartyUsers(token,name,username,pageNum,PageSize);
     }
 
+    @GetMapping("/getAll")
+    public Result<?> getAll(KbAuthorizedUser user){
+        return authorizedUserService.getAll(user);
+    }
+
+    /**
+     * 查看资讯有哪些人有权限查看
+     * */
+    @GetMapping("/knowBelongWho")
+    public Result<?> knowBelongWho(
+            @RequestParam(name="knowledgeProjectId") String knowledgeProjectId,
+            @RequestParam(name="knowledgeId") String knowledgeId){
+        return authorizedUserService.knowBelongWho(knowledgeProjectId,knowledgeId);
+    }
 
 }

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

@@ -115,6 +115,10 @@ public class KbAuthorizedUser extends Model<KbAuthorizedUser> {
      */
     @TableField(exist = false)
     private Integer isAll;
+    @TableField(exist = false)
+    private Integer pageNum;
+    @TableField(exist = false)
+    private Integer pageSize;
 
 
 }

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

@@ -30,10 +30,21 @@ public interface KbAuthorizedUserService extends IService<KbAuthorizedUser> {
     Result<?> doCheck(String token);
     Result<?> doCheckAndGetUser(String token);
 
+    /**
+     * 已经在授权用户表存在的用户不会在授权用户表中重复存储。
+     * 存储授权用户在某个节点下以及所有子节点的授权信息（如果这个用户在某个子节点已经有授权了，则不改变子节点之前的权限）
+     * （顶级节点，”所有“）根节点授权的用户 只会存储本节点的用户权限信息
+     * */
     Result<?> add(List<KbAuthorizedUser> authorizedUser);
 
+    /**
+     * 删除用户在某节点下的授权信息，删除后 如果所有节点都没有此用户的授权信息了，则删除授权用户
+     * */
     Result<?> delById(String id, String knowledgeProjectId);
 
     Result<?> addUserPermitsKnows(AddUserPermissKnowsVo addUserPermissKnowsVo);
 
+    Result<?>  getAll(KbAuthorizedUser user);
+
+    Result<?> knowBelongWho(String knowledgeProjectId, String knowledgeId);
 }

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

@@ -169,6 +169,13 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
                         .eq(KbKnowledgeProject::getPid,projectId)
                         .eq(StrUtil.isNotBlank(category),KbKnowledgeProject::getCategory,category));
             }
+
+            List<KbPermissions> list = permissionsService.list(Wrappers.<KbPermissions>lambdaQuery().in(KbPermissions::getPermissionCode,Arrays.asList("p_look","p_edit","p_del")));
+            List<KbRole> rManager = roleService.list(Wrappers.<KbRole>lambdaQuery().eq(KbRole::getRoleCode, "r_manager"));
+            kbKnowledgeProjects.forEach(e -> {
+                e.setPermissions(list);
+                e.setRoles(rManager);
+            });
             return Result.OK(kbKnowledgeProjects);
         }else {
             List<KbKnowledgeProject> kbKnowledgeProjects ;

src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       max-request-size: 1024MB
       max-file-size: 100MB
   datasource:
-    url: jdbc:mysql://114.116.44.11:3306/knowledge?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True
+    url: jdbc:mysql://114.116.44.11:3306/knowledge?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
     username: ciglobal
     password: qwer@9988&zzsn
   elasticsearch: