添加 数据权限访问范围实现

base-manager/db/permission.sql

+
+-- ----------------------------
+-- 数据授权权限表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_dimension`;
+CREATE TABLE `mortals_xhx_dimension` (
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `dimension_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '维度编码',
+    `dimension_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '维度名称',
+    `dimension_value` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '维度值',
+    `dimension_type` tinyint(2)  DEFAULT '1' COMMENT '维度类型(1.固定值,2.系统上下问变量)',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateUserId` bigint(20)      COMMENT '更新用户',
+    `updateTime` datetime      COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC COMMENT='授权维度';
+
+-- ----------------------------
+-- 角色资源授权规则表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_dimension_resource_rule`;
+CREATE TABLE `mortals_xhx_dimension_resource_rule` (
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `role_id` bigint(20)  DEFAULT NULL COMMENT '角色ID',
+    `role_name` varchar(64)  DEFAULT NULL COMMENT '角色名称',
+    `resource_id` bigint(20) DEFAULT NULL COMMENT '资源ID',
+    `resource_name` varchar(64)  DEFAULT NULL COMMENT '资源名称',
+    `rule_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '规则编码',
+    `rule_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '规则名称',
+    `rule_condition` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT 'IN' COMMENT '规则条件(IN.属于,<.小于,>.大于,=.等于,!=.不等于,>=.大于等于,<=.小于等于,like %.左模糊,like %.右模糊)',
+    `rule_value` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '规则值,固定值或者系统变量',
+    `rule_type` tinyint(2)  DEFAULT '1' COMMENT '规则值类型(1.固定值,2.系统上下问变量)',
+    `create_time` datetime      COMMENT '创建时间',
+    `create_user_id` bigint(20)      COMMENT '创建用户',
+    `update_user_id` bigint(20)      COMMENT '更新用户',
+    `update_time` datetime      COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci ROW_FORMAT=DYNAMIC COMMENT='角色资源维度规则表';
+
+
+
+
+

base-manager/src/main/java/com/mortals/xhx/annotation/DataPermission.java

+package com.mortals.xhx.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ *
+ * @author: zxfei
+ * @date: 2024/5/15 16:09
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Documented
+public @interface DataPermission {
+    /**
+     * 数据权限类型
+     * 1 上下级授权  2 数据范围授权
+     */
+    String permissionType() default "2";
+
+    /**
+     * 配置菜单的组件路径,用于数据权限
+     */
+    String componentRoute() default "";
+}

base-manager/src/main/java/com/mortals/xhx/common/code/DimensionTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 维度类型(1.固定值,2.系统上下问变量)枚举类
+*
+* @author zxfei
+*/
+public enum DimensionTypeEnum {
+    固定值(1, "固定值"),
+    系统上下问变量(2, "系统上下问变量");
+    private Integer value;
+    private String desc;
+
+    DimensionTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static DimensionTypeEnum getByValue(Integer value) {
+        for (DimensionTypeEnum dimensionTypeEnum : DimensionTypeEnum.values()) {
+            if (dimensionTypeEnum.getValue() == value) {
+                return dimensionTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (DimensionTypeEnum item : DimensionTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/code/RuleConditionEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 规则条件(IN.属于,<.小于,>.大于,=.等于,!=.不等于,>=.大于等于,<=.小于等于,like %.左模糊,like %.右模糊)枚举类
+*
+* @author zxfei
+*/
+public enum RuleConditionEnum {
+    属于("IN", "属于"),
+    小于("<", "小于"),
+    大于(">", "大于"),
+    等于("=", "等于"),
+    不等于("!=", "不等于"),
+    大于等于(">=", "大于等于"),
+    小于等于("<=", "小于等于"),
+    左模糊("like %", "左模糊"),
+    右模糊("like %", "右模糊");
+    private String value;
+    private String desc;
+
+    RuleConditionEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static RuleConditionEnum getByValue(String value) {
+        for (RuleConditionEnum ruleConditionEnum : RuleConditionEnum.values()) {
+            if (ruleConditionEnum.getValue() == value) {
+                return ruleConditionEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (RuleConditionEnum item : RuleConditionEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/code/RuleTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 规则值类型(1.固定值,2.系统上下问变量)枚举类
+*
+* @author zxfei
+*/
+public enum RuleTypeEnum {
+    固定值(1, "固定值"),
+    系统上下问变量(2, "系统上下问变量");
+    private Integer value;
+    private String desc;
+
+    RuleTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static RuleTypeEnum getByValue(Integer value) {
+        for (RuleTypeEnum ruleTypeEnum : RuleTypeEnum.values()) {
+            if (ruleTypeEnum.getValue() == value) {
+                return ruleTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (RuleTypeEnum item : RuleTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/common/utils/DataPermissionUtils.java

+package com.mortals.xhx.common.utils;
+
+import com.mortals.framework.service.IUser;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+import org.apache.commons.compress.utils.Lists;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+public class DataPermissionUtils {
+
+    public static final String COMPONENT_DATA_RULES = "COMPONENT_DATA_RULES";
+
+    public static final String SYS_USER_INFO = "SYS_USER_INFO";
+
+
+
+    /**
+     * 往链接请求里面，传入数据查询条件
+     *
+     * @param request
+     * @param componentRules
+     */
+    public static void installDataSearchConditon(HttpServletRequest request, List<DimensionResourceRuleEntity> componentRules) {
+        // 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST
+        List<DimensionResourceRuleEntity> list = loadDataSearchCondition(request);
+        if (list == null) {
+            // 2.如果不存在，则new一个list
+            list = Lists.newArrayList();
+        }
+        list.addAll(componentRules);
+        // 3.往list里面增量存指
+        request.setAttribute(COMPONENT_DATA_RULES, list);
+    }
+
+
+    /**
+     * 往链接请求里面，传入数据查询条件
+     *
+     * @param request
+     * @param searchSql
+     */
+    public static void installSearchSql(HttpServletRequest request,String searchSql) {
+        // 1.先从request获取MENU_DATA_AUTHOR_RULES，如果存则获取到LIST
+
+        // 3.往list里面增量存指
+     //   request.setAttribute(DATA_PERMISSION_SEARCH_SQL, searchSql);
+    }
+
+
+    /**
+     * 获取请求对应的数据权限规则
+     */
+    @SuppressWarnings("unchecked")
+    public static synchronized List<DimensionResourceRuleEntity> loadDataSearchCondition(HttpServletRequest request) {
+        return (List<DimensionResourceRuleEntity>) request.getAttribute(COMPONENT_DATA_RULES);
+    }
+
+    public static synchronized void installUserInfo(HttpServletRequest request, IUser userinfo) {
+        request.setAttribute(SYS_USER_INFO, userinfo);
+    }
+}

base-manager/src/main/java/com/mortals/xhx/common/utils/RuleQueryGenerator.java

+package com.mortals.xhx.common.utils;
+
+import cn.hutool.core.util.ReflectUtil;
+import com.google.common.collect.Maps;
+import com.mortals.framework.service.IUser;
+import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.code.RuleConditionEnum;
+import com.mortals.xhx.common.code.RuleTypeEnum;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 权限sql 查询语句实现
+ *
+ * @author: zxfei
+ * @date: 2024/5/15 10:44
+ */
+@Slf4j
+@UtilityClass
+public class RuleQueryGenerator {
+
+    private static final String SQL_AND = " and ";
+
+    private static final String SQL_OR = " or ";
+
+    private static final String SQL_JOINT = " (%s) ";
+
+
+    public static String getPermissionSql(List<DimensionResourceRuleEntity> conditionList, IUser loginUser) {
+        //存在权限
+        //对当前身份根据规则编码分组-去除不同角色中相同编码且规则值为ALL的规则 并根据角色id分组
+        Map<Long, List<DimensionResourceRuleEntity>> ruleMap = getRuleMapByRoleId(conditionList);
+
+        StringBuilder sb = new StringBuilder();
+        String roleSql;
+        if (MapUtils.isNotEmpty(ruleMap)) {
+            //按角色拼接SQL
+            for (Map.Entry<Long, List<DimensionResourceRuleEntity>> entry : ruleMap.entrySet()) {
+                List<DimensionResourceRuleEntity> lists = entry.getValue();
+                // 同角色之间使用 AND
+                roleSql = buildRoleSql(lists, loginUser);
+                //角色之间使用 OR
+                if (StringUtils.isNotEmpty(roleSql)) {
+                    jointSqlByRoles(sb, roleSql);
+                }
+            }
+
+        }
+        return sb.toString();
+    }
+
+
+    /**
+     * 获取带有数据权限的SQL
+     *
+     * @param identityId 身份ID
+     */
+    public String getPermissionSql(String identityId) {
+        //------------------------获取当前身份的数据规则------------------------------------
+        List<DimensionResourceRuleEntity> conditionList = getCurrentIdentyPermission(identityId);
+        if (ObjectUtils.isEmpty(conditionList)) {
+            //没有权限
+            return "1 = 0";
+        }
+        //存在权限
+        //对当前身份根据规则编码分组-去除不同角色中相同编码且规则值为ALL的规则 并根据角色id分组
+        Map<Long, List<DimensionResourceRuleEntity>> ruleMap = getRuleMapByRoleId(conditionList);
+
+        StringBuilder sb = new StringBuilder();
+        String roleSql;
+        if (MapUtils.isNotEmpty(ruleMap)) {
+            //按角色拼接SQL
+            for (Map.Entry<Long, List<DimensionResourceRuleEntity>> entry : ruleMap.entrySet()) {
+
+                List<DimensionResourceRuleEntity> lists = entry.getValue();
+
+                // 同角色之间使用 AND
+                roleSql = buildRoleSql(lists, null);
+
+                //角色之间使用 OR
+                if (StringUtils.isNotEmpty(roleSql)) {
+                    jointSqlByRoles(sb, roleSql);
+                }
+            }
+
+        }
+        return sb.toString();
+    }
+
+    private static List<DimensionResourceRuleEntity> getCurrentIdentyPermission(String identityId) {
+        return null;
+
+/*        //----------------------------获取所有数据规则-----------------------------
+        List<DimensionResourceRuleEntity> roleRuleList = DataPermissionUtils.loadDataSearchCondition();
+        if(ObjectUtils.isEmpty(roleRuleList)){
+            return null;
+        }
+        //-----------------------------过滤掉不属于当前身份的规则-----------------------------------
+        return roleRuleList.stream()
+               // .filter(item -> item.getIdentityId().equals(identityId))
+                .collect(Collectors.toList());*/
+    }
+
+    /**
+     * 构建单角色SQL
+     */
+    private static String buildRoleSql(List<DimensionResourceRuleEntity> lists, IUser loginUser) {
+        StringBuilder roleSql = new StringBuilder();
+        for (DimensionResourceRuleEntity item : lists) {
+            //如果出现全选 则 代表全部，不需要限定范围
+            if ("ALL".equals(item.getRuleValue())) {
+                continue;
+            }
+            //将规则转换成SQL
+            String filedSql = convertRuleToSql(item, loginUser);
+
+            if(!ObjectUtils.isEmpty(filedSql)){
+                roleSql.append(SQL_AND).append(filedSql);
+            }
+
+        }
+        return roleSql.toString();
+    }
+
+
+    /**
+     * 将单一规则转化成SQL，默认全部使用 In
+     * ruleCode : area_test
+     * ruleValue : 区域1，区域2，区域3
+     *
+     * @param rule 规则值
+     */
+    private static String convertRuleToSql(DimensionResourceRuleEntity rule, IUser loginUser) {
+
+        //判断规则类型
+        String ruleValueConvert = "";
+        if (RuleConditionEnum.属于.getValue().equalsIgnoreCase(rule.getRuleCondition())) {
+            String whereCondition = " in ";
+            if(RuleTypeEnum.系统上下问变量.getValue()==rule.getRuleType()){
+                ruleValueConvert = getInConditionValue(rule.getRuleValue(),loginUser);
+                if(ObjectUtils.isEmpty(ruleValueConvert)) return null;
+                return rule.getRuleCode() + whereCondition + ruleValueConvert;
+            }else{
+                ruleValueConvert = getInConditionValue(rule.getRuleValue());
+                if(ObjectUtils.isEmpty(ruleValueConvert)) return null;
+                return rule.getRuleCode() + whereCondition + ruleValueConvert;
+            }
+        } else if (RuleConditionEnum.大于.getValue().equalsIgnoreCase(rule.getRuleCondition())) {
+            String whereCondition = " > ";
+            ruleValueConvert = getGreaterConditionValue(rule.getRuleValue());
+            return rule.getRuleCode() + whereCondition + ruleValueConvert;
+        } else {
+            //todo
+            //不支持的类型
+        }
+        return null;
+
+    }
+
+
+    /**
+     * IN字符串转换
+     * 区域1, 区域2, 区域3  --> ("区域1","区域2","区域3")
+     * 江西大区  --> ("江西大区")
+     */
+    private static String getInConditionValue(String ruleValue) {
+        String[] temp = ruleValue.split(",");
+        StringBuilder res = new StringBuilder();
+        for (String string : temp) {
+            res.append(",'").append(string).append("'");
+        }
+        return "(" + res.substring(1) + ")";
+    }
+
+    /**
+     * IN字符串转换
+     * 区域1, 区域2, 区域3  --> ("区域1","区域2","区域3")
+     * 江西大区  --> ("江西大区")
+     */
+    private static String getInConditionValue(String ruleValue,IUser loginUser) {
+        //el表达式 提取变量  再通过反射获取值，最终设置值
+        Object fieldValue = ReflectUtil.getFieldValue(loginUser, ruleValue);
+        if(fieldValue!=null){
+            return "(" + fieldValue + ")";
+        }
+        return null;
+
+    }
+
+    /**
+     * > 字符串转换
+     * 区域1, 区域2, 区域3  --> ("区域1","区域2","区域3")
+     * 江西大区  --> ("江西大区")
+     */
+    private static String getGreaterConditionValue(String ruleValue) {
+        return ruleValue;
+    }
+
+    /**
+     * 拼接单角色的SQL
+     *
+     * @param sqlBuilder 总的SQL
+     * @param roleSql    单角色SQL
+     */
+    private static void jointSqlByRoles(StringBuilder sqlBuilder, String roleSql) {
+        roleSql = roleSql.replaceFirst(SQL_AND, "");
+        if (StringUtils.isEmpty(sqlBuilder.toString())) {
+            sqlBuilder.append(String.format(SQL_JOINT, roleSql));
+        } else {
+            sqlBuilder.append(SQL_OR).append(String.format(SQL_JOINT, roleSql));
+        }
+    }
+
+    /**
+     * 1. 对当前身份根据规则编码分组-去除不同角色中相同编码且规则值为ALL的规则
+     * 2. 对角色进行分组
+     *
+     * @param conditionList 数据规则
+     * @return 分组后的规则list
+     */
+    public static Map<Long, List<DimensionResourceRuleEntity>> getRuleMapByRoleId(List<DimensionResourceRuleEntity> conditionList) {
+        //--------过滤掉不属于当前身份的规则,并对条件编码进行分组-----------------------------------
+        Map<String, List<DimensionResourceRuleEntity>> conditionMap = conditionList.stream().collect(Collectors.groupingBy(DimensionResourceRuleEntity::getRuleCode));
+
+        //--------相同编码分组中存在ALL的排除掉-----------------------------------------------
+        List<DimensionResourceRuleEntity> newRoleRuleList = new ArrayList<>();
+        if (MapUtils.isNotEmpty(conditionMap)) {
+            for (Map.Entry<String, List<DimensionResourceRuleEntity>> entry : conditionMap.entrySet()) {
+                boolean flag = true;
+                List<DimensionResourceRuleEntity> lists = entry.getValue();
+                for (DimensionResourceRuleEntity item : lists) {
+                    if ("ALL".equals(item.getRuleValue())) {
+                        flag = false;
+                        break;
+                    }
+                }
+
+                if (flag) {
+                    newRoleRuleList.addAll(lists);
+                }
+            }
+        }
+        if (CollectionUtils.isNotEmpty(newRoleRuleList)) {
+            return newRoleRuleList.stream().collect(Collectors.groupingBy(DimensionResourceRuleEntity::getRoleId));
+        }
+        return Maps.newHashMap();
+    }
+}

base-manager/src/main/java/com/mortals/xhx/module/dimension/dao/DimensionDao.java

+package com.mortals.xhx.module.dimension.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.dimension.model.DimensionEntity;
+
+/**
+* 授权维度Dao
+* 授权维度 DAO接口
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+
+public interface  DimensionDao extends ICRUDDao<DimensionEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/dimension/dao/DimensionResourceRuleDao.java

+package com.mortals.xhx.module.dimension.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+
+import java.util.List;
+/**
+* 角色资源维度规则Dao
+* 角色资源维度规则 DAO接口
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+
+public interface  DimensionResourceRuleDao extends ICRUDDao<DimensionResourceRuleEntity,Long>{
+
+    List<DimensionResourceRuleEntity> getRoleComponentRule(Long userId,String route);
+}

base-manager/src/main/java/com/mortals/xhx/module/dimension/dao/ibatis/DimensionDaoImpl.java

+package com.mortals.xhx.module.dimension.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.dimension.dao.DimensionDao;
+import com.mortals.xhx.module.dimension.model.DimensionEntity;
+import org.springframework.stereotype.Repository;
+
+/**
+* 授权维度DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Repository("dimensionDao")
+public class DimensionDaoImpl extends BaseCRUDDaoMybatis<DimensionEntity,Long> implements DimensionDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/dimension/dao/ibatis/DimensionResourceRuleDaoImpl.java

+package com.mortals.xhx.module.dimension.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.dimension.dao.DimensionResourceRuleDao;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+/**
+* 角色资源维度规则DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Repository("dimensionResourceRuleDao")
+public class DimensionResourceRuleDaoImpl extends BaseCRUDDaoMybatis<DimensionResourceRuleEntity,Long> implements DimensionResourceRuleDao {
+
+
+    /**
+     * @param userId
+     * @param route
+     * @return
+     */
+    @Override
+    public List<DimensionResourceRuleEntity> getRoleComponentRule(Long userId, String route) {
+
+        return getSqlSession().selectList(getSqlId("getRoleComponentRule"), new HashMap<String, Object>() {
+            {
+                put("userId", userId);
+                put("route", route);
+            }
+        });
+    }
+}

base-manager/src/main/java/com/mortals/xhx/module/dimension/model/DimensionEntity.java

+package com.mortals.xhx.module.dimension.model;
+import com.mortals.xhx.module.dimension.model.vo.DimensionVo;
+import lombok.Data;
+/**
+* 授权维度实体对象
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Data
+public class DimensionEntity extends DimensionVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 维度编码
+    */
+    private String dimensionCode;
+    /**
+    * 维度名称
+    */
+    private String dimensionName;
+    /**
+    * 维度值
+    */
+    private String dimensionValue;
+    /**
+    * 维度类型(1.固定值,2.系统上下问变量)
+    */
+    private Integer dimensionType;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DimensionEntity) {
+            DimensionEntity tmp = (DimensionEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+            this.dimensionCode = "";
+            this.dimensionName = "";
+            this.dimensionValue = "";
+            this.dimensionType = 1;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/model/DimensionResourceRuleEntity.java

+package com.mortals.xhx.module.dimension.model;
+
+import com.mortals.xhx.module.dimension.model.vo.DimensionResourceRuleVo;
+import lombok.Data;
+/**
+ * 角色资源维度规则实体对象
+ *
+ * @author zxfei
+ * @date 2024-05-22
+ */
+@Data
+public class DimensionResourceRuleEntity extends DimensionResourceRuleVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+    /**
+     * 资源ID
+     */
+    private Long resourceId;
+    /**
+     * 规则编码
+     */
+    private String ruleCode;
+    /**
+     * 规则名称
+     */
+    private String ruleName;
+    /**
+     * 规则条件(IN.属于,<.小于,>.大于,=.等于,!=.不等于,>=.大于等于,<=.小于等于,like %.左模糊,like %.右模糊)
+     */
+    private String ruleCondition;
+    /**
+     * 规则值,固定值或者系统变量
+     */
+    private String ruleValue;
+    /**
+     * 规则值类型(1.固定值,2.系统上下问变量)
+     */
+    private Integer ruleType;
+    /**
+     * 角色名称
+     */
+    private String roleName;
+    /**
+     * 资源名称
+     */
+    private String resourceName;
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DimensionResourceRuleEntity) {
+            DimensionResourceRuleEntity tmp = (DimensionResourceRuleEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+        this.roleId = null;
+        this.resourceId = null;
+        this.ruleCode = "";
+        this.ruleName = "";
+        this.ruleCondition = "IN";
+        this.ruleValue = "";
+        this.ruleType = 1;
+        this.roleName = "";
+        this.resourceName = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/model/vo/DimensionResourceRuleVo.java

+package com.mortals.xhx.module.dimension.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* 角色资源维度规则视图对象
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Data
+public class DimensionResourceRuleVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/model/vo/DimensionVo.java

+package com.mortals.xhx.module.dimension.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* 授权维度视图对象
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Data
+public class DimensionVo extends BaseEntityLong {
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/service/DimensionResourceRuleService.java

+package com.mortals.xhx.module.dimension.service;
+
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.dimension.dao.DimensionResourceRuleDao;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+
+import java.util.List;
+
+/**
+* DimensionResourceRuleService
+*
+* 角色资源维度规则 service接口
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+public interface DimensionResourceRuleService extends ICRUDService<DimensionResourceRuleEntity,Long>{
+
+    DimensionResourceRuleDao getDao();
+
+    /**
+     * 根据当前controller路由获取用户角色资源维度规则
+     * @param userId
+     * @param route 当前controller路由
+     * @return
+     */
+    List<DimensionResourceRuleEntity> getRoleComponentRule(Long userId,String route);
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/service/DimensionService.java

+package com.mortals.xhx.module.dimension.service;
+
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.dimension.dao.DimensionDao;
+import com.mortals.xhx.module.dimension.model.DimensionEntity;
+/**
+* DimensionService
+*
+* 授权维度 service接口
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+public interface DimensionService extends ICRUDService<DimensionEntity,Long>{
+
+    DimensionDao getDao();
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/service/impl/DimensionResourceRuleServiceImpl.java

+package com.mortals.xhx.module.dimension.service.impl;
+
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.dimension.dao.DimensionResourceRuleDao;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+import com.mortals.xhx.module.dimension.service.DimensionResourceRuleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* DimensionResourceRuleService
+* 角色资源维度规则 service实现
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Service("dimensionResourceRuleService")
+@Slf4j
+public class DimensionResourceRuleServiceImpl extends AbstractCRUDServiceImpl<DimensionResourceRuleDao, DimensionResourceRuleEntity, Long> implements DimensionResourceRuleService {
+
+    /**
+     * @param userId
+     * @param route  当前controller路由
+     * @return
+     */
+    @Override
+    public List<DimensionResourceRuleEntity> getRoleComponentRule(Long userId, String route) {
+         return this.getDao().getRoleComponentRule(userId, route);
+
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/service/impl/DimensionServiceImpl.java

+package com.mortals.xhx.module.dimension.service.impl;
+
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.dimension.dao.DimensionDao;
+import com.mortals.xhx.module.dimension.model.DimensionEntity;
+import com.mortals.xhx.module.dimension.service.DimensionService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+/**
+* DimensionService
+* 授权维度 service实现
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@Service("dimensionService")
+@Slf4j
+public class DimensionServiceImpl extends AbstractCRUDServiceImpl<DimensionDao, DimensionEntity, Long> implements DimensionService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/web/DimensionController.java

+package com.mortals.xhx.module.dimension.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.DimensionTypeEnum;
+import com.mortals.xhx.module.dimension.model.DimensionEntity;
+import com.mortals.xhx.module.dimension.service.DimensionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*
+* 授权维度
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@RestController
+@RequestMapping("dimension")
+public class DimensionController extends BaseCRUDJsonBodyMappingController<DimensionService,DimensionEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DimensionController(){
+        super.setModuleDesc( "授权维度");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+                this.addDict(model, "dimensionType", DimensionTypeEnum.getEnumMap());
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/dimension/web/DimensionResourceRuleController.java

+package com.mortals.xhx.module.dimension.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.RuleConditionEnum;
+import com.mortals.xhx.common.code.RuleTypeEnum;
+import com.mortals.xhx.module.dimension.model.DimensionResourceRuleEntity;
+import com.mortals.xhx.module.dimension.service.DimensionResourceRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+*
+* 角色资源维度规则
+*
+* @author zxfei
+* @date 2024-05-16
+*/
+@RestController
+@RequestMapping("dimension/resource/rule")
+public class DimensionResourceRuleController extends BaseCRUDJsonBodyMappingController<DimensionResourceRuleService,DimensionResourceRuleEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public DimensionResourceRuleController(){
+        super.setModuleDesc( "角色资源维度规则");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+                this.addDict(model, "ruleCondition", RuleConditionEnum.getEnumMap());
+                this.addDict(model, "ruleType", RuleTypeEnum.getEnumMap());
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/resources/sqlmap/module/dimension/DimensionResourceRuleMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.dimension.dao.ibatis.DimensionResourceRuleDaoImpl">
+
+
+    <!-- 获取列表 -->
+    <select id="getRoleComponentRule" parameterType="java.util.HashMap" resultMap="DimensionResourceRuleEntity-Map">
+        SELECT DISTINCT
+        t1.role_id,
+        t1.resource_id,
+        t1.rule_code,
+        t1.rule_name,
+        t1.rule_condition,
+        t1.rule_value,
+        t1.rule_type,
+        t2.userId
+        FROM
+        mortals_xhx_dimension_resource_rule t1
+        LEFT JOIN mortals_xhx_role_user t2 ON t1.role_id = t2.roleId
+        LEFT JOIN mortals_xhx_role_auth t3 ON t1.role_id = t3.roleId
+        LEFT JOIN mortals_xhx_resource t4 ON t4.id = t3.resourceId
+        WHERE
+        FIND_IN_SET( #{route}, t4.url )
+        AND t2.userId = #{userId}
+    </select>
+
+</mapper>
\ No newline at end of file

base-manager/src/test/java/TestParsePost.java

+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.utils.MatterHtmlParseUtil;
+import com.mortals.xhx.module.matter.model.MatterEntity;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+public class TestParsePost {
+
+    @Test
+    public void testUrl() {
+
+        String url = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
+        HashMap<String, String> params = new HashMap<>();
+        params.put("areaCode", "511500000000");
+        params.put("dxType", "6");
+        params.put("deptCode", "11511200MB1147469G");
+        params.put("searchtext", "");
+       // params.put("type", "2");//类型 2.部门  1.主题  3.热度
+        params.put("taskType", "");
+        // params.put("pageno", "1");
+        Rest<Map<String, Integer>> rest = MatterHtmlParseUtil.statSiteMatterCount(params, url);
+        System.out.println(JSON.toJSONString(rest));
+
+        List<MatterEntity> allList = new ArrayList<>();
+        String url1 = "http://www.sczwfw.gov.cn/jiq/interface/item/tags";
+        HashMap<String, String> params1 = new HashMap<>();
+        params1.put("areaCode", "511500000000");
+        params1.put("dxType", "6");
+        params1.put("deptCode", "11511200MB1147469G");
+        params1.put("searchtext", "");
+     //   params1.put("type", "2");
+        params1.put("taskType", "");
+        for (int i = 1; i <= rest.getData().get("pageNum"); i++) {
+            params1.put("pageno", String.valueOf(i));
+            Rest<List<MatterEntity>> restList = MatterHtmlParseUtil.getMatterList(params1, url1);
+            if (restList.getCode() == YesNoEnum.YES.getValue() && !ObjectUtils.isEmpty(restList.getData())) {
+                allList.addAll(restList.getData());
+            }
+        }
+
+        for (int i = 0; i < allList.size(); i++) {
+            System.out.println(i + "  " + allList.get(i).getMatterName()+"  "+ allList.get(i).getUrl()) ;
+        }
+
+    }
+
+
+}

base-manager/src/test/java/TestPost.java

+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+@Slf4j
+public class TestPost {
+
+    @Test
+    public void testUrl() {
+
+        HashMap<String, String> headers = new HashMap<>();
+        headers.put("satoken","d186dc7a-8f07-4936-9f36-94aeb7b246bb");
+        HttpRequest httpRequest = HttpUtil.createGet("http://59.225.206.13:8331/oauth-pro/admin-pro/oauth2/isLogin").headerMap(headers, true);
+
+        String resp = httpRequest.execute().body();
+        //String resp = httpRequest.getUrl();
+
+      //  String resp = HttpUtil.get("http://59.225.206.13:8331/oauth-pro/admin-pro/oauth2/isLogin");
+
+        log.info("resp:{}",resp);
+
+    }
+
+
+}

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -208,13 +208,14 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         if (sysUser.getLoginLock() == null) {
             sysUser.setLoginLock(0);
         }
-        if (sysUser.getLoginLock() == 1 && sysUser.getLockTime() != null) {
+        //取消账户锁定功能
+/*        if (sysUser.getLoginLock() == 1 && sysUser.getLockTime() != null) {
             String nowStr = DateUtils.getCurrStrDate();
             String loginDateStr = DateUtils.getDateTime(sysUser.getLockTime(), "yyyy-MM-dd");
             if (nowStr.equals(loginDateStr)) {
                 throw new AppException("此账号当天密码错误次数已达上限，已被锁定");
             }
-        }
+        }*/
 
         try {
             if (StringUtils.isNotEmpty(sysUser.getSaltKey())) {

portal-manager/src/test/java/com/mortals/httpclient/system.http

@@ -16,7 +16,7 @@ Content-Type: application/json
 {
   "loginName":"admin",
   "password":"admin",
-  "securityCode":"8888"
+  "securityCode":"admin"
 }
 
 > {%