2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-05-26 4e91adbb41c89688fe5b0ef03807cfe748a7d59d
角色
已修改4个文件
27 ■■■■■ 文件已修改
sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sandu-common/src/main/java/com/sandu/common/enums/RoleLevelStatus.java
@@ -9,7 +9,8 @@
     */
    SUPER(1, "超级管理员"),
    COMMON(2, "普通管理员"),
    NORMAL(3, "普通用户"),
    NORMAL(3, "一级客户"),
    NORMAL2(4, "二级客户"),
    ;
    private final Integer code;
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -74,8 +74,8 @@
        if (role == null) {
            throw new BusinessException("角色不存在");
        }
        if (!RoleLevelStatus.NORMAL.getCode().equals(role.getLevel())) {
            throw new BusinessException("无法添加超级管理员或用户管理员");
        if (RoleLevelStatus.SUPER.getCode().equals(role.getLevel())) {
            throw new BusinessException("无法添加超级管理员");
        }
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -24,13 +24,11 @@
    public boolean addProgram(LEDProgramParam receiveParam) {
        LEDProgram led = new LEDProgram();
//        if (SecurityUtils.getClientId() != null) {
            led.setUserId(SecurityUtils.getUserId());
            led.setUserName(SecurityUtils.getUsername());
            if (clientService.findClientId()) {
                led.setClientId(clientService.getClientId());
            }
//        }
        led.setUserId(SecurityUtils.getUserId());
        led.setUserName(SecurityUtils.getUsername());
        if (clientService.findClientId()) {
            led.setClientId(clientService.getClientId());
        }
        led.setName(receiveParam.getName());
        led.setPreview(receiveParam.getPreviewUrl());
        led.setWidth(receiveParam.getWidth());
ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -113,11 +113,13 @@
        //设置角色权限等级
        if (param.getLevel() != null) {
            if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
                role.setLevel(RoleLevelStatus.SUPER.getCode());
                throw new BusinessException("无法添加超级管理员角色");
            } else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
                role.setLevel(RoleLevelStatus.COMMON.getCode());
            } else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
                role.setLevel(RoleLevelStatus.NORMAL.getCode());
            } else if (param.getLevel().equals(RoleLevelStatus.NORMAL2.getCode())) {
                role.setLevel(RoleLevelStatus.NORMAL2.getCode());
            } else {
                role.setLevel(RoleLevelStatus.NORMAL.getCode());
            }
@@ -147,11 +149,13 @@
        //设置角色权限等级
        if (param.getLevel() != null) {
            if (param.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
                role.setLevel(RoleLevelStatus.SUPER.getCode());
                throw new BusinessException("无法修改成超级管理员角色");
            } else if (param.getLevel().equals(RoleLevelStatus.COMMON.getCode())) {
                role.setLevel(RoleLevelStatus.COMMON.getCode());
            } else if (param.getLevel().equals(RoleLevelStatus.NORMAL.getCode())) {
                role.setLevel(RoleLevelStatus.NORMAL.getCode());
            } else if (param.getLevel().equals(RoleLevelStatus.NORMAL2.getCode())) {
                role.setLevel(RoleLevelStatus.NORMAL2.getCode());
            } else {
                role.setLevel(RoleLevelStatus.NORMAL.getCode());
            }