新增角色管理功能，包括角色的新增、编辑、禁用、启用、删除及相关接口

杨刚
1 parent f5c2dda9
Showing 8 changed files with 266 additions and 27 deletions
src/main/java/com/diligrp/rider/controller/PlatformSystemRoleController.java
src/main/java/com/diligrp/rider/dto/AdminRoleSaveDTO.java
src/main/java/com/diligrp/rider/service/SystemRoleMenuService.java
src/main/java/com/diligrp/rider/service/SystemRoleService.java
src/main/java/com/diligrp/rider/service/impl/MenuBootstrapServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/SystemRoleMenuServiceImpl.java
src/main/java/com/diligrp/rider/service/impl/SystemRoleServiceImpl.java
src/main/java/com/diligrp/rider/vo/AdminRoleVO.java
@@ -2,7 +2,9 @@ package com.diligrp.rider.controller;
 import com.diligrp.rider.common.result.Result;
 import com.diligrp.rider.dto.AdminRoleMenuAssignDTO;
+import com.diligrp.rider.dto.AdminRoleSaveDTO;
 import com.diligrp.rider.service.SystemRoleMenuService;
+import com.diligrp.rider.service.SystemRoleService;
 import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
 import com.diligrp.rider.vo.AdminRoleVO;
 import jakarta.validation.Valid;
@@ -16,11 +18,42 @@ import java.util.List;
 @RequiredArgsConstructor
 public class PlatformSystemRoleController {
+    private final SystemRoleService systemRoleService;
     private final SystemRoleMenuService systemRoleMenuService;
     @GetMapping("/list")
-    public Result<List<AdminRoleVO>> list() {
-        return Result.success(systemRoleMenuService.listRoles());
+    public Result<List<AdminRoleVO>> list(@RequestParam(defaultValue = "false") boolean includeDisabled) {
+        return Result.success(systemRoleService.list(includeDisabled));
+    }
+
+    @PostMapping("/add")
+    public Result<Void> add(@Valid @RequestBody AdminRoleSaveDTO dto) {
+        systemRoleService.add(dto);
+        return Result.success();
+    }
+
+    @PutMapping("/edit")
+    public Result<Void> edit(@Valid @RequestBody AdminRoleSaveDTO dto) {
+        systemRoleService.edit(dto);
+        return Result.success();
+    }
+
+    @PostMapping("/ban")
+    public Result<Void> ban(@RequestParam Long id) {
+        systemRoleService.ban(id);
+        return Result.success();
+    }
+
+    @PostMapping("/cancelBan")
+    public Result<Void> cancelBan(@RequestParam Long id) {
+        systemRoleService.cancelBan(id);
+        return Result.success();
+    }
+
+    @DeleteMapping("/del")
+    public Result<Void> del(@RequestParam Long id) {
+        systemRoleService.del(id);
+        return Result.success();
     }
     @GetMapping("/{roleId}/menu-tree")
+package com.diligrp.rider.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class AdminRoleSaveDTO {
+    private Long id;
+
+    @NotBlank(message = "角色编码不能为空")
+    private String code;
+
+    @NotBlank(message = "角色名称不能为空")
+    private String name;
+
+    @NotBlank(message = "角色范围不能为空")
+    private String roleScope;
+}
@@ -2,13 +2,9 @@ package com.diligrp.rider.service;
 import com.diligrp.rider.dto.AdminRoleMenuAssignDTO;
 import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
-import com.diligrp.rider.vo.AdminRoleVO;
-
 import java.util.List;
 public interface SystemRoleMenuService {
-    List<AdminRoleVO> listRoles();
-
     List<AdminRoleMenuTreeVO> getRoleMenuTree(Long roleId);
     void assignMenus(Long roleId, AdminRoleMenuAssignDTO dto);
+package com.diligrp.rider.service;
+
+import com.diligrp.rider.dto.AdminRoleSaveDTO;
+import com.diligrp.rider.vo.AdminRoleVO;
+
+import java.util.List;
+
+public interface SystemRoleService {
+    List<AdminRoleVO> list(boolean includeDisabled);
+
+    void add(AdminRoleSaveDTO dto);
+
+    void edit(AdminRoleSaveDTO dto);
+
+    void ban(Long id);
+
+    void cancelBan(Long id);
+
+    void del(Long id);
+}
@@ -77,8 +77,9 @@ public class MenuBootstrapServiceImpl implements MenuBootstrapService {
         defaults.add(menu("open.mock_delivery", "模拟推单", "MENU", "/open/mock-delivery", "", 0L, MenuScopeEnum.PLATFORM, 92));
         defaults.add(menu("system.root", "系统管理", "DIR", "", "ControlOutlined", 0L, MenuScopeEnum.PLATFORM, 100));
         defaults.add(menu("system.menu", "菜单管理", "MENU", "/system/menu", "", 0L, MenuScopeEnum.PLATFORM, 101));
-        defaults.add(menu("system.role_menu", "角色菜单", "MENU", "/system/role-menu", "", 0L, MenuScopeEnum.PLATFORM, 102));
-        defaults.add(menu("admin.user", "平台账号", "MENU", "/admin-user", "", 0L, MenuScopeEnum.PLATFORM, 103));
+        defaults.add(menu("system.role", "角色管理", "MENU", "/system/role", "", 0L, MenuScopeEnum.PLATFORM, 102));
+        defaults.add(menu("system.role_menu", "角色菜单", "MENU", "/system/role-menu", "", 0L, MenuScopeEnum.PLATFORM, 103));
+        defaults.add(menu("admin.user", "平台账号", "MENU", "/admin-user", "", 0L, MenuScopeEnum.PLATFORM, 104));
         Map<String, SysMenu> persisted = new LinkedHashMap<>();
         for (SysMenu menu : defaults) {
@@ -103,8 +104,13 @@ public class MenuBootstrapServiceImpl implements MenuBootstrapService {
         persisted.get("open.app").setParentId(persisted.get("open.root").getId());
         persisted.get("open.mock_delivery").setParentId(persisted.get("open.root").getId());
         persisted.get("system.menu").setParentId(persisted.get("system.root").getId());
+        persisted.get("system.menu").setListOrder(101);
+        persisted.get("system.role").setParentId(persisted.get("system.root").getId());
+        persisted.get("system.role").setListOrder(102);
         persisted.get("system.role_menu").setParentId(persisted.get("system.root").getId());
+        persisted.get("system.role_menu").setListOrder(103);
         persisted.get("admin.user").setParentId(persisted.get("system.root").getId());
+        persisted.get("admin.user").setListOrder(104);
         for (SysMenu menu : persisted.values()) {
             sysMenuMapper.updateById(menu);
@@ -12,12 +12,10 @@ import com.diligrp.rider.mapper.SysRoleMapper;
 import com.diligrp.rider.mapper.SysRoleMenuMapper;
 import com.diligrp.rider.service.SystemRoleMenuService;
 import com.diligrp.rider.vo.AdminRoleMenuTreeVO;
-import com.diligrp.rider.vo.AdminRoleVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,23 +31,6 @@ public class SystemRoleMenuServiceImpl implements SystemRoleMenuService {
     private final SystemMenuServiceImpl systemMenuService;
     @Override
-    public List<AdminRoleVO> listRoles() {
-        List<SysRole> roles = sysRoleMapper.selectList(new LambdaQueryWrapper<SysRole>()
-                .eq(SysRole::getStatus, 1)
-                .orderByAsc(SysRole::getId));
-        List<AdminRoleVO> result = new ArrayList<>();
-        for (SysRole role : roles) {
-            AdminRoleVO vo = new AdminRoleVO();
-            vo.setId(role.getId());
-            vo.setCode(role.getCode());
-            vo.setName(role.getName());
-            vo.setRoleScope(role.getRoleScope());
-            result.add(vo);
-        }
-        return result;
-    }
-
-    @Override
     public List<AdminRoleMenuTreeVO> getRoleMenuTree(Long roleId) {
         SysRole role = requireRole(roleId);
         List<SysMenu> allowedMenus = filterMenusByScope(systemMenuService.listAllMenus(), role);
+package com.diligrp.rider.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.diligrp.rider.common.enums.AdminRoleScopeEnum;
+import com.diligrp.rider.common.exception.BizException;
+import com.diligrp.rider.dto.AdminRoleSaveDTO;
+import com.diligrp.rider.entity.AdminUser;
+import com.diligrp.rider.entity.Substation;
+import com.diligrp.rider.entity.SysRole;
+import com.diligrp.rider.entity.SysRoleMenu;
+import com.diligrp.rider.mapper.AdminUserMapper;
+import com.diligrp.rider.mapper.SubstationMapper;
+import com.diligrp.rider.mapper.SysRoleMapper;
+import com.diligrp.rider.mapper.SysRoleMenuMapper;
+import com.diligrp.rider.service.SystemRoleService;
+import com.diligrp.rider.vo.AdminRoleVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+@Service
+@RequiredArgsConstructor
+public class SystemRoleServiceImpl implements SystemRoleService {
+
+    private static final Set<String> BUILT_IN_CODES = Set.of("platform_admin", "substation_admin");
+
+    private final SysRoleMapper sysRoleMapper;
+    private final SysRoleMenuMapper sysRoleMenuMapper;
+    private final AdminUserMapper adminUserMapper;
+    private final SubstationMapper substationMapper;
+
+    @Override
+    public List<AdminRoleVO> list(boolean includeDisabled) {
+        List<SysRole> roles = sysRoleMapper.selectList(new LambdaQueryWrapper<SysRole>()
+                .eq(!includeDisabled, SysRole::getStatus, 1)
+                .orderByAsc(SysRole::getId));
+        List<AdminRoleVO> result = new ArrayList<>();
+        for (SysRole role : roles) {
+            result.add(toVO(role));
+        }
+        return result;
+    }
+
+    @Override
+    public void add(AdminRoleSaveDTO dto) {
+        validateScope(dto.getRoleScope());
+        ensureUniqueCode(dto.getCode(), null);
+
+        SysRole role = new SysRole();
+        role.setCode(dto.getCode().trim());
+        role.setName(dto.getName().trim());
+        role.setRoleScope(dto.getRoleScope());
+        role.setStatus(1);
+        role.setCreateTime(System.currentTimeMillis() / 1000);
+        sysRoleMapper.insert(role);
+    }
+
+    @Override
+    public void edit(AdminRoleSaveDTO dto) {
+        if (dto.getId() == null || dto.getId() < 1) {
+            throw new BizException("角色ID不能为空");
+        }
+        SysRole role = requireRole(dto.getId());
+        if (isBuiltIn(role)) {
+            throw new BizException("内置角色不允许编辑");
+        }
+        validateScope(dto.getRoleScope());
+        if (!role.getRoleScope().equals(dto.getRoleScope())) {
+            throw new BizException("角色范围不允许修改");
+        }
+        ensureUniqueCode(dto.getCode(), role.getId());
+        role.setCode(dto.getCode().trim());
+        role.setName(dto.getName().trim());
+        sysRoleMapper.updateById(role);
+    }
+
+    @Override
+    public void ban(Long id) {
+        SysRole role = requireRole(id);
+        if (isBuiltIn(role)) {
+            throw new BizException("内置角色不允许禁用");
+        }
+        ensureNotBound(role.getId(), "当前角色已绑定账号，不能禁用");
+        sysRoleMapper.update(null, new LambdaUpdateWrapper<SysRole>()
+                .eq(SysRole::getId, id)
+                .set(SysRole::getStatus, 0));
+    }
+
+    @Override
+    public void cancelBan(Long id) {
+        requireRole(id);
+        sysRoleMapper.update(null, new LambdaUpdateWrapper<SysRole>()
+                .eq(SysRole::getId, id)
+                .set(SysRole::getStatus, 1));
+    }
+
+    @Override
+    @Transactional
+    public void del(Long id) {
+        SysRole role = requireRole(id);
+        if (isBuiltIn(role)) {
+            throw new BizException("内置角色不允许删除");
+        }
+        ensureNotBound(role.getId(), "当前角色已绑定账号，不能删除");
+        sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
+                .eq(SysRoleMenu::getRoleId, role.getId()));
+        sysRoleMapper.deleteById(role.getId());
+    }
+
+    private SysRole requireRole(Long id) {
+        if (id == null || id < 1) {
+            throw new BizException("角色ID不能为空");
+        }
+        SysRole role = sysRoleMapper.selectById(id);
+        if (role == null) {
+            throw new BizException("角色不存在");
+        }
+        return role;
+    }
+
+    private void validateScope(String scope) {
+        for (AdminRoleScopeEnum value : AdminRoleScopeEnum.values()) {
+            if (value.name().equals(scope)) {
+                return;
+            }
+        }
+        throw new BizException("角色范围不合法");
+    }
+
+    private void ensureUniqueCode(String code, Long excludeId) {
+        SysRole duplicate = sysRoleMapper.selectOne(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getCode, code.trim())
+                .ne(excludeId != null, SysRole::getId, excludeId)
+                .last("LIMIT 1"));
+        if (duplicate != null) {
+            throw new BizException("角色编码已存在");
+        }
+    }
+
+    private void ensureNotBound(Long roleId, String message) {
+        if (countAdminUsers(roleId) > 0 || countSubstations(roleId) > 0) {
+            throw new BizException(message);
+        }
+    }
+
+    private AdminRoleVO toVO(SysRole role) {
+        AdminRoleVO vo = new AdminRoleVO();
+        vo.setId(role.getId());
+        vo.setCode(role.getCode());
+        vo.setName(role.getName());
+        vo.setRoleScope(role.getRoleScope());
+        vo.setStatus(role.getStatus());
+        vo.setBuiltIn(isBuiltIn(role));
+        vo.setAdminUserCount(countAdminUsers(role.getId()));
+        vo.setSubstationCount(countSubstations(role.getId()));
+        vo.setCreateTime(role.getCreateTime());
+        return vo;
+    }
+
+    private boolean isBuiltIn(SysRole role) {
+        return BUILT_IN_CODES.contains(role.getCode());
+    }
+
+    private long countAdminUsers(Long roleId) {
+        Long count = adminUserMapper.selectCount(new LambdaQueryWrapper<AdminUser>()
+                .eq(AdminUser::getRoleId, roleId));
+        return count == null ? 0L : count;
+    }
+
+    private long countSubstations(Long roleId) {
+        Long count = substationMapper.selectCount(new LambdaQueryWrapper<Substation>()
+                .eq(Substation::getRoleId, roleId));
+        return count == null ? 0L : count;
+    }
+}
@@ -8,4 +8,9 @@ public class AdminRoleVO {
     private String code;
     private String name;
     private String roleScope;
+    private Integer status;
+    private Boolean builtIn;
+    private Long adminUserCount;
+    private Long substationCount;
+    private Long createTime;
 }