Merge remote-tracking branch 'origin/master'

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

@@ -65,11 +65,13 @@ public class KbAuthorizedUserController {
             @RequestParam(name="name",required = false) String name,
             @RequestParam(name="orgId",required = false) String orgId,
             @RequestParam(name="orgName",required = false) String orgName,
+            @RequestParam(name="knowledgeProjectId",required = false) String knowledgeProjectId,
+            @RequestParam(name="category",required = false) String category,
             @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum,
             @RequestParam(name="PageSize",defaultValue = "10") Integer PageSize
     ){
 
-        return  authorizedUserService.lists(roleId,username,name,orgId,orgName,pageNum,PageSize);
+        return  authorizedUserService.lists(roleId,username,name,orgId,orgName,knowledgeProjectId,category,pageNum,PageSize);
 
     }
 

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

@@ -110,6 +110,11 @@ public class KbAuthorizedUser extends Model<KbAuthorizedUser> {
      */
     @TableField(exist = false)
     private String knowledgeProjectId;
+    /**
+     * 是否有所有节点的权限,0是，1否
+     */
+    @TableField(exist = false)
+    private Integer isAll;
 
 
 }

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

@@ -27,7 +27,7 @@ public class KbAuthuserKnowledgeprojectMap extends Model<KbAuthuserKnowledgeproj
     private Long id;
 
     @TableField("auth_user_id")
-    private Long authUserId;
+    private String authUserId;
 
     @TableField("knowledge_project_id")
     private String knowledgeProjectId;

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

 package com.zzsn.knowbase.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,13 +30,18 @@ public class KbUserRoleMap extends Model<KbUserRoleMap> {
      * 授权用户id
      */
     @TableField("user_id")
-    private Long userId;
+    private String userId;
 
     /**
      * 角色id
      */
     @TableField("role_id")
-    private Long roleId;
+    private String roleId;
+    /**
+     * 知识库分类id
+     */
+    @TableField("knowledge_project_id")
+    private String knowledgeProjectId;
 
 
 

src/main/java/com/zzsn/knowbase/mapper/KbAuthorizedUserMapper.java

@@ -24,11 +24,11 @@ public interface KbAuthorizedUserMapper extends BaseMapper<KbAuthorizedUser> {
     @Select("SELECT a.*,GROUP_CONCAT(b.role_id SEPARATOR ',') as roleId,GROUP_CONCAT(c.role_name SEPARATOR ',') as roleName FROM kb_authorized_user a " +
             "LEFT JOIN kb_user_role_map b ON a.id = b.user_id " +
             "LEFT JOIN kb_role c ON c.id = b.role_id " +
-            "${sql}"+
+            "LEFT JOIN kb_authuser_knowledgeproject_map d ON d.auth_user_id = a.id " +
             "${ew.customSqlSegment}"+
             "GROUP BY a.id"
     )
-    IPage<KbAuthorizedUser> page(Page<KbAuthorizedUser> page, @Param(Constants.WRAPPER) QueryWrapper<KbAuthorizedUser> query, String sql);
+    IPage<KbAuthorizedUser> pageList(Page<KbAuthorizedUser> page, @Param(Constants.WRAPPER) QueryWrapper<KbAuthorizedUser> query);
 
 
     @Select("SELECT a.*,GROUP_CONCAT(b.role_id SEPARATOR ',') as roleId,GROUP_CONCAT(c.role_name SEPARATOR ',') as roleName FROM kb_authorized_user a " +

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

@@ -20,7 +20,7 @@ public interface KbAuthorizedUserService extends IService<KbAuthorizedUser> {
 
     Result<?> edit(KbAuthorizedUser authorizedUser);
 
-    Result<?> lists(String roleId, String username, String name, String orgId, String orgName, Integer pageNum, Integer pageSize);
+    Result<?> lists(String roleId, String username, String name, String orgId, String orgName, String knowledgeProjectId, String category, Integer pageNum, Integer pageSize);
 
     Result<?> userPermission(String token);
 

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

@@ -49,6 +49,8 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
     KbRolePermissionMapService rolePermissionMapService;
     @Autowired
     KbAuthuserKnowledgeprojectMapService authuserKnowledgeprojectMapService;
+    @Autowired
+    KbKnowledgeProjectService knowledgeProjectService;
 
     /**
      * 校验第三方用户接口地址
@@ -70,6 +72,13 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
         authorizedUser.setCreateTime(new Date());
         super.save(authorizedUser);
 
+
+        /**插入用户知识库权限关系表*/
+        if (StringUtils.isNotBlank(authorizedUser.getKnowledgeProjectId())){
+            KbAuthuserKnowledgeprojectMap kbAuthuserKnowledgeprojectMap = new KbAuthuserKnowledgeprojectMap();
+            kbAuthuserKnowledgeprojectMap.setAuthUserId(authorizedUser.getId());
+            kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
+            authuserKnowledgeprojectMapService.save(kbAuthuserKnowledgeprojectMap);
             /**插入用户角色关系表*/
             if (StringUtils.isNotBlank(authorizedUser.getRoleId())){
                 String roleId = authorizedUser.getRoleId();
@@ -77,18 +86,12 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
                 List<KbUserRoleMap> maps = new ArrayList<>();
                 list.forEach(e->{
                     KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
-                kbUserRoleMap.setUserId(Long.parseLong(authorizedUser.getId()));
-                kbUserRoleMap.setRoleId(Long.parseLong(e));
+                    kbUserRoleMap.setUserId(authorizedUser.getId());
+                    kbUserRoleMap.setRoleId(e);
                     maps.add(kbUserRoleMap);
                 });
                 kbUserRoleMapService.saveBatch(maps);
             }
-        /**插入用户知识库权限关系表*/
-        if (StringUtils.isNotBlank(authorizedUser.getKnowledgeProjectId())){
-            KbAuthuserKnowledgeprojectMap kbAuthuserKnowledgeprojectMap = new KbAuthuserKnowledgeprojectMap();
-            kbAuthuserKnowledgeprojectMap.setAuthUserId(Long.parseLong(authorizedUser.getId()));
-            kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
-            authuserKnowledgeprojectMapService.save(kbAuthuserKnowledgeprojectMap);
         }
         return  Result.OK();
     }
@@ -100,41 +103,84 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             return  Result.error("请选择要授权的用户");
         }
 
-        authorizedUsers.forEach(e-> {
+        List<KbAuthorizedUser> kbAuthorizedUsers = authorizedUserMapper.selectList(Wrappers.<KbAuthorizedUser>lambdaQuery().in(KbAuthorizedUser::getUserId, authorizedUsers.stream().map(KbAuthorizedUser::getUserId).collect(Collectors.toList())));
+        List<String> collect = kbAuthorizedUsers.stream().map(KbAuthorizedUser::getUserId).collect(Collectors.toList());
+
+        //已经授权过的用户在用户表里不用重复插入
+        List<KbAuthorizedUser> notExist = authorizedUsers.stream().filter(f -> !collect.contains(f.getUserId())).collect(Collectors.toList());
+        notExist.forEach(e-> {
             /**保存授权用户*/
             e.setStatus("0");
             e.setCreateTime(new Date());
         });
 
-        super.saveBatch(authorizedUsers);
+        super.saveBatch(notExist);
+
+        //获取这一批下面的其中一个用户，获取这批用户关联的知识库分类
+        KbAuthorizedUser kbAuthorizedUser = authorizedUsers.get(0);
+        if (!"0".equals(kbAuthorizedUser.getKnowledgeProjectId())) {
 
+            //查询授权节点和其子节点，一起授权
+            List<KbKnowledgeProject> projectTypes = knowledgeProjectService.list(Wrappers.<KbKnowledgeProject>lambdaQuery().like(KbKnowledgeProject::getFullPath, kbAuthorizedUser.getKnowledgeProjectId()));
 
             List<KbUserRoleMap> maps = new ArrayList<>();
             List<KbAuthuserKnowledgeprojectMap> userknows = new ArrayList<>();
 
             authorizedUsers.forEach(authorizedUser->{
+                /**插入用户知识库分类权限关系表*/
+                if (CollectionUtil.isNotEmpty(projectTypes)){
+                    projectTypes.forEach(e -> {
+                        KbAuthuserKnowledgeprojectMap kbAuthuserKnowledgeprojectMap = new KbAuthuserKnowledgeprojectMap();
+                        kbAuthuserKnowledgeprojectMap.setAuthUserId(authorizedUser.getId());
+                        kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(e.getId());
+                        kbAuthuserKnowledgeprojectMap.setSign(0);
+                        userknows.add(kbAuthuserKnowledgeprojectMap);
                         /**插入用户角色关系表*/
                         if (StringUtils.isNotBlank(authorizedUser.getRoleId())){
                             String roleId = authorizedUser.getRoleId();
                             List<String> list = Arrays.asList(roleId.split(","));
-                list.forEach(e->{
+                            list.forEach(ee->{
                                 KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
-                    kbUserRoleMap.setUserId(Long.parseLong(authorizedUser.getId()));
-                    kbUserRoleMap.setRoleId(Long.parseLong(e));
+                                kbUserRoleMap.setUserId(authorizedUser.getId());
+                                kbUserRoleMap.setRoleId(ee);
+                                kbUserRoleMap.setKnowledgeProjectId(e.getId());
                                 maps.add(kbUserRoleMap);
                             });
                         }
+                    });
+
+
+                }
+            });
+
+            kbUserRoleMapService.saveBatch(maps);
+            authuserKnowledgeprojectMapService.saveBatch(userknows);
+        }else {
+            authorizedUsers.forEach(authorizedUser->{
                 /**插入用户知识库权限关系表*/
                 if (StringUtils.isNotBlank(authorizedUser.getKnowledgeProjectId())){
                     KbAuthuserKnowledgeprojectMap kbAuthuserKnowledgeprojectMap = new KbAuthuserKnowledgeprojectMap();
-                kbAuthuserKnowledgeprojectMap.setAuthUserId(Long.parseLong(authorizedUser.getId()));
+                    kbAuthuserKnowledgeprojectMap.setAuthUserId(authorizedUser.getId());
                     kbAuthuserKnowledgeprojectMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
-                userknows.add(kbAuthuserKnowledgeprojectMap);
+                    authuserKnowledgeprojectMapService.save(kbAuthuserKnowledgeprojectMap);
+
                 }
+                /**插入用户角色关系表*/
+                if (StringUtils.isNotBlank(authorizedUser.getRoleId())){
+                    String roleId = authorizedUser.getRoleId();
+                    List<String> list = Arrays.asList(roleId.split(","));
+                    List<KbUserRoleMap> maps = new ArrayList<>();
+                    list.forEach(e->{
+                        KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
+                        kbUserRoleMap.setUserId(authorizedUser.getId());
+                        kbUserRoleMap.setRoleId(e);
+                        kbUserRoleMap.setKnowledgeProjectId(authorizedUser.getKnowledgeProjectId());
+                        maps.add(kbUserRoleMap);
                     });
-
                     kbUserRoleMapService.saveBatch(maps);
-        authuserKnowledgeprojectMapService.saveBatch(userknows);
+                }
+            });
+        }
 
 
         return  Result.OK();
@@ -156,8 +202,8 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             List<KbUserRoleMap> maps = new ArrayList<>();
             list.forEach(e->{
                 KbUserRoleMap kbUserRoleMap = new KbUserRoleMap();
-                kbUserRoleMap.setUserId(Long.parseLong(authorizedUser.getId()));
-                kbUserRoleMap.setRoleId(Long.parseLong(e));
+                kbUserRoleMap.setUserId( authorizedUser.getId());
+                kbUserRoleMap.setRoleId(e);
                 maps.add(kbUserRoleMap);
             });
             kbUserRoleMapService.saveBatch(maps);
@@ -167,18 +213,21 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
     }
 
     @Override
-    public Result<?> lists(String roleId, String username, String name, String orgId, String orgName, Integer pageNum, Integer pageSize) {
+    public Result<?> lists(String roleId, String username, String name, String orgId, String orgName, String knowledgeProjectId, String category, Integer pageNum, Integer pageSize) {
         QueryWrapper<KbAuthorizedUser> query = new QueryWrapper<>();
         Page<KbAuthorizedUser> page = new Page<>(pageNum, pageSize);
 
         query.eq(StringUtils.isNotBlank(username),"a.username",username);
-        query.like(StringUtils.isNotBlank(name),"a.name",name);
         query.eq(StringUtils.isNotBlank(orgId),"a.org_id",orgId);
-        query.like(StringUtils.isNotBlank(orgName),"a.org_name",orgName);
         query.eq(StringUtils.isNotBlank(roleId),"b.role_id",roleId);
+        query.eq(StringUtils.isNotBlank(knowledgeProjectId),"d.knowledge_project_id",knowledgeProjectId);
+        query.like(StringUtils.isNotBlank(name),"a.name",name);
+        query.like(StringUtils.isNotBlank(orgName),"a.org_name",orgName);
+
+
         //根据一些条件动态的关联表
         String sql = "";
-        IPage<KbAuthorizedUser> res = authorizedUserMapper.page(page, query, sql);
+        IPage<KbAuthorizedUser> res = authorizedUserMapper.pageList(page, query);
         return Result.OK(res);
     }
 
@@ -200,6 +249,19 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             QueryWrapper<KbAuthorizedUser> query = new QueryWrapper<>();
             query.eq("a.user_id",bean.getUserId());
             KbAuthorizedUser one = authorizedUserMapper.getOne(query);
+            /**是否是所有节点的管理员*/
+            List<KbAuthuserKnowledgeprojectMap> list1 = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery()
+                    .eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, one.getId())
+                    .eq(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId, "0")
+                    .eq(KbAuthuserKnowledgeprojectMap::getSign, 0)
+            );
+
+            if (CollectionUtil.isNotEmpty(list1)){
+                one.setIsAll(0);
+            }else {
+                one.setIsAll(1);
+            }
+
             List<KbRole> kbRoles = roleService.listByIds(Arrays.asList(one.getRoleId().split(",")));
 
             List<KbRolePermissionMap> permissionMaps = rolePermissionMapService.list(Wrappers.<KbRolePermissionMap>lambdaQuery().in(KbRolePermissionMap::getRoleId, Arrays.asList(one.getRoleId().split(","))));
@@ -269,6 +331,18 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
             QueryWrapper<KbAuthorizedUser> query = new QueryWrapper<>();
             query.eq("a.user_id",bean.getUserId());
             KbAuthorizedUser one = authorizedUserMapper.getOne(query);
+            /**是否是所有节点的管理员*/
+            List<KbAuthuserKnowledgeprojectMap> list1 = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery()
+                    .eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, one.getId())
+                    .eq(KbAuthuserKnowledgeprojectMap::getKnowledgeProjectId, "0")
+                    .eq(KbAuthuserKnowledgeprojectMap::getSign, 0)
+            );
+
+            if (CollectionUtil.isNotEmpty(list1)){
+                one.setIsAll(0);
+            }else {
+                one.setIsAll(1);
+            }
             return Result.OK(one);
         }else {
             return Result.error("第三方系统未通过用户校验");

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

@@ -6,13 +6,16 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zzsn.knowbase.entity.KbAuthorizedUser;
 import com.zzsn.knowbase.entity.KbAuthuserKnowMap;
 import com.zzsn.knowbase.entity.KbAuthuserKnowledgeprojectMap;
 import com.zzsn.knowbase.entity.KbKnowledgeProject;
 import com.zzsn.knowbase.mapper.KbKnowledgeProjectMapper;
+import com.zzsn.knowbase.service.KbAuthorizedUserService;
 import com.zzsn.knowbase.service.KbAuthuserKnowMapService;
 import com.zzsn.knowbase.service.KbAuthuserKnowledgeprojectMapService;
 import com.zzsn.knowbase.service.KbKnowledgeProjectService;
+import com.zzsn.knowbase.util.SpringContextUtils;
 import com.zzsn.knowbase.vo.Result;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -22,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
-import java.util.logging.LogManager;
 import java.util.stream.Collectors;
 
 /**
@@ -35,10 +37,18 @@ import java.util.stream.Collectors;
  */
 @Service
 public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjectMapper, KbKnowledgeProject> implements KbKnowledgeProjectService {
+
     @Autowired
-    private KbAuthuserKnowMapService authuserKnowMapService;
+    KbAuthorizedUserService kbAuthorizedUserService;
+    @Autowired
+    KbKnowledgeProjectMapper kbKnowledgeProjectMapper;
     @Autowired
-    private KbAuthuserKnowledgeprojectMapService authuserKnowledgeprojectMapService;
+    KbAuthuserKnowledgeprojectMapService authuserKnowledgeprojectMapService;
+    @Autowired
+    KbAuthuserKnowMapService kbAuthuserKnowMapService;
+
+    @Autowired
+    private KbAuthuserKnowMapService authuserKnowMapService;
     @Override
     @Transactional
     public Result<?> add(KbKnowledgeProject knowledgeProject) {
@@ -67,6 +77,13 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
         return Result.OK();
     }
 
+    public List<KbAuthuserKnowledgeprojectMap> getUserKnowProjectMapByUserId(String userId){
+        //用户所拥有权限的知识库分类集合
+        List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, userId));
+        List<KbAuthuserKnowMap> list1 = kbAuthuserKnowMapService.list(Wrappers.<KbAuthuserKnowMap>lambdaQuery().eq(KbAuthuserKnowMap::getAuthUserId, userId));
+        return list;
+    }
+
     @Override
     @Transactional
     public Result<?> edit(KbKnowledgeProject knowledgeProject) {
@@ -134,6 +151,7 @@ public class KbKnowledgeProjectServiceImpl extends ServiceImpl<KbKnowledgeProjec
     @Override
     public Result<?> lists(String sign, String projectId, String category) {
 
+        KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
 
         //这个用户所拥有的所有的分类的权限
 //        List<KbAuthuserKnowledgeprojectMap> list = authuserKnowledgeprojectMapService.list(Wrappers.<KbAuthuserKnowledgeprojectMap>lambdaQuery().eq(KbAuthuserKnowledgeprojectMap::getAuthUserId, one.getId()));