用户权限

sckw-auth/src/main/java/com/sckw/auth/service/impl/IndexServiceImpl.java

@@ -23,6 +23,7 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -101,7 +102,13 @@ public class IndexServiceImpl implements IIndexService {
 
             //存权限菜单
             List<UserAccessMenuInfoResDto> userAccessMenuInfo = remoteUserService.queryUserAccessMenu(loginResVo.getId());
-            RedissonUtils.add(CacheGroup.ACCESSMENU + id, JSON.toJSONString(userAccessMenuInfo));
+            List<String> strings = new ArrayList<>();
+            for (UserAccessMenuInfoResDto userAccessMenuInfoResDto : userAccessMenuInfo) {
+                List<String> strings1 = Arrays.asList(userAccessMenuInfoResDto.getLinks().split(","));
+                strings.addAll(strings1);
+            }
+            boolean b = RedissonUtils.putSet(CacheGroup.ACCESSMENU + id, strings);
+//            RedissonUtils.add(CacheGroup.ACCESSMENU + id, JSON.toJSONString(userAccessMenuInfo));
         } catch (Exception e) {
             throw new SystemException(HttpStatus.GLOBAL_EXCEPTION_CODE, HttpStatus.GLOBAL_EXCEPTION_MESSAGE);
         }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -13,7 +13,6 @@ import com.sckw.core.web.constant.RequestConstant;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.model.LoginUserInfo;
 import com.sckw.redis.utils.RedissonUtils;
-import jakarta.annotation.Resource;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
@@ -80,11 +79,14 @@ public class LoginFilter implements Filter {
         }
 
         //按钮有权限才放行
-        List<String> links = getMenus(key);
-        if (!links.contains(requestUri)) {
+        checkMenu(key, requestUri);
+        filterChain.doFilter(servletRequest, servletResponse);
+    }
+
+    private void checkMenu(String key, String url) {
+        if(!RedissonUtils.contains(CacheGroup.ACCESSMENU + key, url)) {
             throw new SystemException(HttpStatus.AUTHORITY_NO_CODE, HttpStatus.ACCESS_FIAL);
         }
-        filterChain.doFilter(servletRequest, servletResponse);
     }
 
     private List<String> getMenus(String key) {

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/PasswordUtils.java

@@ -108,8 +108,8 @@ public class PasswordUtils {
     }
 
     public static void main(String[] args) {
-        String password = PasswordUtils.entryptPassword(PasswordUtils.md5("pt"));
-        String md5 = PasswordUtils.md5("czh");
+        String password = PasswordUtils.entryptPassword(PasswordUtils.md5("184"));
+        String md5 = PasswordUtils.md5("184");
         System.out.println(password);
         System.out.println(md5);
         System.out.println(validatePassword(md5, password));

sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/utils/RedissonUtils.java

@@ -1,10 +1,16 @@
 package com.sckw.redis.utils;
 
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.Redisson;
 import org.redisson.api.*;
 import org.redisson.client.codec.StringCodec;
+import org.redisson.config.Config;
 
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
@@ -201,6 +207,25 @@ public class RedissonUtils {
         return redissonUtils.redissonClient.getSet(key);
     }
 
+    public static <T> boolean putSet(String key, T value) {
+        RSet<Object> set = redissonUtils.redissonClient.getSet(key);
+        return set.add(value);
+    }
+
+    public static <T> boolean putSet(String key, List<T> list) {
+        RSet<Object> set = redissonUtils.redissonClient.getSet(key);
+        return set.addAll(list);
+    }
+
+    public static <T> boolean contains(String key, T value){
+        RSet<Object> set = redissonUtils.redissonClient.getSet(key);
+        return set.contains(value);
+    }
+
+    public static RSet<Object> getSet(String key){
+        return redissonUtils.redissonClient.getSet(key);
+    }
+
 
     /**
      * 暴露redisson的RScoredSortedSet对象
@@ -231,4 +256,20 @@ public class RedissonUtils {
         }
     }
 
+    public static void main(String[] args) {
+        List<String> set = new ArrayList<>();
+        set.add("asdsad");
+        set.add("132146");
+        set.add("jgfdt345");
+        Config config = new Config();
+        config.useSingleServer().setAddress("redis://" + "127.0.0.1" + ":" + "6379").setDatabase(1);
+        String key = "test:123";
+        RedissonClient redissonClient = Redisson.create(config);
+        RSet<Object> set1 = redissonClient.getSet(key);
+        set1.addAll(set);
+
+        RSet<Object> rSet = redissonClient.getSet(key);
+        System.out.println(rSet.contains("jgfdt345"));
+    }
+
 }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/UserAccessMenuInfoResDto.java

@@ -19,7 +19,7 @@ public class UserAccessMenuInfoResDto implements Serializable {
     /**
      * 菜单ID
      */
-    private long menuId;
+    private long id;
 
     /**
      * 菜单名

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsEnterpriseController.java

@@ -11,7 +11,6 @@ import com.sckw.system.model.vo.req.KwsEnterpriseReqVo;
 import com.sckw.system.service.KwsEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -28,7 +27,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param id 主键ID
-     * @return
+     * @return HttpResult
      * @description 根据主键查询
      * @author zk
      * @date 2023/06/02
@@ -40,7 +39,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param pageReqVo
-     * @return
+     * @return HttpResult
      * @description 分页查询
      * @author zk
      * @date 2023/5/30
@@ -52,7 +51,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param id 主键ID
-     * @return
+     * @return HttpResult
      * @description 企业资质信息
      * @author zk
      * @date 2023/06/02
@@ -63,7 +62,7 @@ public class KwsEnterpriseController {
     }
 
     /**
-     * @return
+     * @return HttpResult
      * @description 注册
      * @author zk
      * @date 2023/06/02
@@ -76,7 +75,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param params {name 机构名称、company 是否公司}
-     * @return
+     * @return HttpResult
      * @description 新增
      * @author zk
      * @date 2023/06/02
@@ -87,7 +86,7 @@ public class KwsEnterpriseController {
     }
 
     /**
-     * @return
+     * @return HttpResult
      * @description 更新/资质认证
      * @author zk
      * @date 2023/06/02
@@ -100,7 +99,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param ids {ids：主键ID（多个以逗号隔开）}
-     * @return
+     * @return HttpResult
      * @description 更新
      * @author zk
      * @date 2023/06/02
@@ -112,7 +111,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param {entId 企业id、status状态0正常1锁定、remark 审批意见}
-     * @return
+     * @return HttpResult
      * @description 企业审批
      * @author zk
      * @date 2023/06/02
@@ -125,7 +124,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param entId 主键ID
-     * @return
+     * @return HttpResult
      * @description 企业审批记录
      * @author zk
      * @date 2023/06/02
@@ -137,7 +136,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param {entId 企业id、status 状态0正常1锁定}
-     * @return
+     * @return HttpResult
      * @description 企业冻结/解冻
      * @author zk
      * @date 2023/06/02
@@ -150,7 +149,7 @@ public class KwsEnterpriseController {
 
     /**
      * @param {entId 变更主账号企业ID, telephone 替换账号，captcha 验证码}
-     * @return
+     * @return HttpResult
      * @description 变更主账号（被替换账号冻结）
      * @author zk
      * @date 2023/06/02

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsMenuController.java

@@ -94,7 +94,7 @@ public class KwsMenuController {
      * @date: 2023/6/13
      */
     @PostMapping("/roleBindMeun")
-    public HttpResult roleBindMeun(@RequestBody RoleBindMeunReqVo reqVo) throws Exception {
+    public HttpResult roleBindMeun(@RequestBody RoleBindMeunReqVo reqVo) {
         kwsMenuService.roleBindMeun(reqVo);
         return HttpResult.ok();
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -1,10 +1,8 @@
 package com.sckw.system.dubbo;
 
-import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.system.api.RemoteUserService;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.api.model.dto.res.*;
@@ -98,8 +96,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         if (CollectionUtils.isEmpty(kwsRoles)) {
             return Collections.emptyList();
         }
-        List<KwsRoleResDto> kwsRoleResDtos = BeanUtils.copyToList(kwsRoles, KwsRoleResDto.class);
-        return kwsRoleResDtos;
+        return BeanUtils.copyToList(kwsRoles, KwsRoleResDto.class);
     }
 
     @Override
@@ -110,20 +107,11 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         }
 
         FindMenuTreePojo findMenuTreePojo = new FindMenuTreePojo();
-        if(kwsUser.getIsMain() == Global.YES) {
-            KwsEnterprise kwsEnterprise = kwsEnterpriseService.findByUserId(kwsUser.getId());
-            if (Objects.isNull(kwsEnterprise)){
-                return Collections.emptyList();
-            }
-            findMenuTreePojo.setEntId(kwsEnterprise.getId());
-        } else {
-            List<KwsUserRole> kwsUserRoles = kwsRoleService.findAllByUserId(id);
-            if (Objects.isNull(kwsUserRoles)){
-                return Collections.emptyList();
-            }
-            List<Long> longs = kwsUserRoles.stream().map(KwsUserRole::getRoleId).toList();
-            findMenuTreePojo.setRoleIds(longs);
+        List<KwsUserRole> kwsUserRoles = kwsRoleService.findAllByUserId(id);
+        if (Objects.isNull(kwsUserRoles)) {
+            return Collections.emptyList();
         }
+        findMenuTreePojo.setRoleIds(kwsUserRoles.stream().map(KwsUserRole::getRoleId).toList());
 
         List<KwsMenuResVo> kwsMenuResVos = kwsMenuService.findList(findMenuTreePojo);
         if (CollectionUtils.isEmpty(kwsMenuResVos)) {
@@ -144,7 +132,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
     }
 
     @Override
-    public List<KwsUserResDto> checkUserBase(String account, int systemType){
+    public List<KwsUserResDto> checkUserBase(String account, int systemType) {
         KwsUser kwsUser = kwsUserService.checkUserBase(account, systemType);
         KwsUserResDto kwsUserService = new KwsUserResDto();
         BeanUtils.copyProperties(kwsUser, kwsUserService);

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsUser.java

@@ -52,7 +52,7 @@ public class KwsUser extends BaseModel {
     private String clientId;
 
     /**
-     * 是否是企业管理（0是 1否）
+     * 是否是企业管理（1是 0否）
      */
     private Integer isMain;
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/pojo/FindMenuTreePojo.java

@@ -27,9 +27,4 @@ public class FindMenuTreePojo {
      */
     private List<Long> roleIds;
 
-    /**
-     * 企业id
-     */
-    private long entId;
-
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/IdResVo.java

@@ -0,0 +1,22 @@
+package com.sckw.system.model.vo.res;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 返参为id的统一类
+ * @date 2023/6/16
+ */
+@Data
+public class IdResVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -6267671021325724162L;
+
+    private long id;
+
+}
+

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsDeptService.java

@@ -40,13 +40,12 @@ public class KwsDeptService {
      * @return
      */
     public void add(KwsDept params) {
-        //params.setEntId(LoginEntHolder.getEntId());
         params.setId(new IdWorker(1).nextId());
         if (StringUtils.isNotBlank(params.getParentId())) {
             KwsDept kwsDept = kwsDeptDao.selectByKey(params.getParentId());
             if (kwsDept != null) {
                 params.setParentIds(kwsDept.getParentIds() + Global.COMMA + params.getId());
-                params.setLevel(kwsDept.getLevel() != null ? kwsDept.getLevel().intValue() + 1 : 1);
+                params.setLevel(kwsDept.getLevel() != null ? kwsDept.getLevel() + 1 : 1);
             }
         }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1,4 +1,5 @@
 package com.sckw.system.service;
+import com.google.common.collect.Lists;
 import java.util.Date;
 
 import java.util.*;
@@ -22,9 +23,11 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.dao.*;
 import com.sckw.system.model.*;
+import com.sckw.system.model.pojo.FindMenuTreePojo;
 import com.sckw.system.model.vo.req.*;
 import com.sckw.system.model.vo.res.CertificateResVo;
-import org.apache.ibatis.annotations.Param;
+import com.sckw.system.model.vo.res.IdResVo;
+import com.sckw.system.model.vo.res.KwsMenuResVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +65,9 @@ public class KwsEnterpriseService {
     @Autowired
     private KwsUserService kwsUserService;
 
+    @Autowired
+    private KwsMenuService kwsMenuService;
+
     /**
      * 添加新纪录
      *
@@ -317,21 +323,24 @@ public class KwsEnterpriseService {
         kwsDept.setName(DeptTypeEnum.MANAGE.getName());
         kwsDept.setCompany(Global.NO);
         kwsDept.setParentId(0L);
-        kwsDept.setParentIds("0");
         kwsDept.setLevel(1);
         kwsDept.setSort(0);
         kwsDept.setId(deptId);
         kwsDeptService.add(kwsDept);
 
         /*5、新增管理员角色*/
-        KwsRole kwsRole = new KwsRole();
-        long roleId = new IdWorker(1L).nextId();
-        kwsRole.setName(Global.MANAGE_NAME);
-        kwsRole.setDeptId(deptId);
-        kwsRole.setId(roleId);
-        kwsRoleService.add(kwsRole);
-
-        /*5、新增管理员用户*/
+        AddRoleReqVo addRoleReqVo = new AddRoleReqVo();
+        List<KwsMenuResVo> list = kwsMenuService.findList(new FindMenuTreePojo());
+        if (CollectionUtils.isEmpty(list)) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+        addRoleReqVo.setName(Global.MANAGE_NAME);
+        addRoleReqVo.setCurrentDeptId(deptId);
+        addRoleReqVo.setMenuIds(String.join(",", list.stream().map(KwsMenuResVo::getId).map(String::valueOf).toList()));
+        addRoleReqVo.setVisiblePersonal(false);
+        IdResVo idResVo = kwsRoleService.add(addRoleReqVo);
+
+        /*6、新增管理员用户*/
         String contacts = reqVo.getContacts();
         String telephone = reqVo.getTelephone();
         UserAddReqVo userAddReqVo = new UserAddReqVo();
@@ -343,7 +352,7 @@ public class KwsEnterpriseService {
         userAddReqVo.setEmail("");
         userAddReqVo.setClientId("");
         userAddReqVo.setIsMain(Global.YES);
-        userAddReqVo.setRoleIds(String.valueOf(roleId));
+        userAddReqVo.setRoleIds(String.valueOf(idResVo.getId()));
         kwsUserService.add(userAddReqVo);
     }
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -1,4 +1,5 @@
 package com.sckw.system.service;
+
 import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * 菜单service接口
+ *
  * @author zk
  * @date 2023-05-31
  */
@@ -45,6 +47,7 @@ public class KwsMenuService {
 
     /**
      * 添加新纪录
+     *
      * @param params
      * @return
      * @throws Exception
@@ -58,13 +61,14 @@ public class KwsMenuService {
             }
         }
 
-        if (kwsMenuDao.insert(params) <=0 ) {
+        if (kwsMenuDao.insert(params) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
     }
 
     /**
      * 删除记录-根据主键
+     *
      * @param ids
      * @return
      * @throws Exception
@@ -93,6 +97,7 @@ public class KwsMenuService {
 
     /**
      * 更新记录
+     *
      * @param params
      * @return
      * @throws Exception
@@ -107,6 +112,7 @@ public class KwsMenuService {
 
     /**
      * 根据主键查询
+     *
      * @param key
      * @return
      * @throws Exception
@@ -117,6 +123,7 @@ public class KwsMenuService {
 
     /**
      * 分页查询
+     *
      * @param reqVo
      * @return
      * @throws Exception
@@ -162,25 +169,16 @@ public class KwsMenuService {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ACCOUNT_NOT_EXISTS);
         }
 
-        //管理员查所有的，普通用户通过企业查
-        if (kwsUser.getIsMain() == Global.YES) {
-            KwsEnterprise kwsEnterprise = kwsEnterpriseDao.findByUserId(userId);
-            if (Objects.isNull(kwsEnterprise)) {
-                throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
-            }
-            findMenuTreePojo.setEntId(kwsEnterprise.getId());
-        } else {
-            List<KwsUserRole> allByUserId = kwsUserRoleDao.findAllByUserId(userId);
-            if (CollectionUtils.isEmpty(allByUserId)) {
-                throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ROLE_NOT_EXISTS);
-            }
-            List<Long> longs = allByUserId.stream().map(KwsUserRole::getRoleId).toList();
-            findMenuTreePojo.setRoleIds(longs);
+        List<KwsUserRole> allByUserId = kwsUserRoleDao.findAllByUserId(userId);
+        if (CollectionUtils.isEmpty(allByUserId)) {
+            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ROLE_NOT_EXISTS);
         }
+        findMenuTreePojo.setRoleIds(allByUserId.stream().map(KwsUserRole::getRoleId).toList());
     }
 
     /**
      * 递归获取下级菜单
+     *
      * @param parentId 父级机构id
      * @param deptList 所有机构
      * @return
@@ -188,7 +186,7 @@ public class KwsMenuService {
     public List<KwsMenuResVo> getChild(Long parentId, List<KwsMenuResVo> deptList) {
         List<KwsMenuResVo> childList = new ArrayList();
         for (KwsMenuResVo kwsMenu : deptList) {
-            if(parentId.equals(kwsMenu.getParentId())){
+            if (parentId.equals(kwsMenu.getParentId())) {
                 //获取当前菜单id的所有子列表
                 childList.add(kwsMenu);
             }
@@ -198,15 +196,15 @@ public class KwsMenuService {
             List<KwsMenuResVo> child = getChild(kwsMenu.getId(), deptList);
             kwsMenu.setChildren(child);
         }
-        if(childList.size()==0){
+        if (childList.size() == 0) {
             //子菜单的长度为0,返回null,null不会被阿里的FastJson包解析
-            return  null;
+            return null;
         }
-        return  childList;
+        return childList;
     }
 
     /**
-     * @param  reqVo 菜单ID多个用","隔开
+     * @param reqVo 菜单ID多个用","隔开
      * @desc: 角色分配菜单
      * @author: czh
      * @date: 2023/6/13

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -16,6 +16,7 @@ import com.sckw.system.model.*;
 import com.sckw.system.model.vo.req.AddRoleReqVo;
 import com.sckw.system.model.vo.req.RoleBindMeunReqVo;
 import com.sckw.system.model.vo.req.UserBindRoleReqVo;
+import com.sckw.system.model.vo.res.IdResVo;
 import com.sckw.system.model.vo.res.KwsDeptResVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -65,10 +66,13 @@ public class KwsRoleService {
      * @date: 2023/6/15
      */
     @Transactional(rollbackFor = Exception.class)
-    public void add(AddRoleReqVo reqVo) {
+    public IdResVo add(AddRoleReqVo reqVo) {
+        IdResVo idResVo = new IdResVo();
+
         /*1、存角色信息*/
         KwsRole kwsRole = new KwsRole();
         long roleId = new IdWorker(1L).nextId();
+        idResVo.setId(roleId);
         kwsRole.setId(roleId);
         kwsRole.setName(reqVo.getName());
         kwsRole.setDeptId(reqVo.getCurrentDeptId());
@@ -93,7 +97,7 @@ public class KwsRoleService {
         /*3、设置数据权限*/
         if (reqVo.getVisiblePersonal()) {
             //只能看见自己的数据则不管
-            return;
+            return idResVo;
         }
         String[] deptIds = reqVo.getDeptIds().split(",");
         List<KwsAuthority> kwsAuthorities = new ArrayList<>();
@@ -116,6 +120,7 @@ public class KwsRoleService {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
 
+        return idResVo;
     }
 
     /**

sckw-modules/sckw-system/src/main/resources/mapper/KwsMenuDao.xml

@@ -37,6 +37,7 @@
         sm.sort,
         sm.level,
         sm.custom,
+        sm.links,
         sm.is_main,
         sm.using_roles,
         sm.remark,