Dev selectUserRoleModule

src/main/java/com/backendsys/controller/Systems/SysUserRoleController.java

@@ -1,112 +0,0 @@
-package com.backendsys.controller.Systems;
-
-import cn.hutool.core.collection.CollUtil;
-import com.backendsys.aspect.QueryNullCheck;
-import com.backendsys.aspect.QueryNullCheckAspect;
-import com.backendsys.entity.PageDTO;
-import com.backendsys.entity.System.SysUserRoleDTO;
-import com.backendsys.service.System.SysUserRoleModuleService;
-import com.backendsys.service.System.SysUserRoleService;
-import com.backendsys.utils.response.Result;
-import com.backendsys.utils.response.ResultEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Arrays;
-
-/**
- * 系统用户角色
- */
-@Validated
-@RestController
-public class SysUserRoleController {
-    @Autowired
-    private SysUserRoleService sysUserRoleService;
-
-    @Autowired
-    private SysUserRoleModuleService sysUserRoleModuleService;
-
-    // 判断 role.modules: [{ id: 1 }, { id: 2 }]，是否有重复值
-    //public boolean hasDuplicateIds(List<LinkedHashMap<String, Object>> modules) {
-    //    List<Object> ids = CollUtil.getFieldValues(modules, "id");
-    //    return CollUtil.isNotEmpty(ids) && ids.size() != CollUtil.distinct(ids).size();
-    //}
-    public boolean hasDuplicateIds(List<Object> ids) {
-        return CollUtil.isNotEmpty(ids) && ids.size() != CollUtil.distinct(ids).size();
-    }
-
-//    // @Operation(summary = "系统用户角色列表")
-//    @PreAuthorize("@ss.hasPermi('4.1')")
-//    @GetMapping("/api/system/user/getUserRole")
-//    public Result getUserRole(@Validated PageDTO pageDTO, @Validated SysUserRoleDTO sysUserRoleDTO) {
-//        return Result.success(sysUserRoleService.queryUserRole(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserRoleDTO));
-//    }
-
-    //@Operation(summary = "系统用户角色详情")
-    @PreAuthorize("@ss.hasPermi('4.1.1')")
-    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
-    @GetMapping("/api/system/user/getUserRoleDetail")
-    public Result getUserRoleDetail(@Validated(SysUserRoleDTO.Detail.class) SysUserRoleDTO sysUserRoleDTO) {
-        return Result.success(QueryNullCheckAspect.getQueryResult());
-    }
-
-    //@Operation(summary = "创建系统用户角色")
-    @PreAuthorize("@ss.hasPermi('4.1.2')")
-    @PostMapping("/api/system/user/createUserRole")
-    public Result createUserRole(@Validated(SysUserRoleDTO.Create.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
-        // 判断 role.modules 是否重复
-        if (hasDuplicateIds(sysUserRoleDTO.getModules())) {
-            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "模块ID出现重复值");
-        }
-        // 创建
-        return Result.success(sysUserRoleService.insertUserRole(sysUserRoleDTO), "创建成功");
-    }
-
-    //@Operation(summary = "更新系统用户角色")
-    @PreAuthorize("@ss.hasPermi('4.1.3')")
-    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
-    @PutMapping("/api/system/user/updateUserRole")
-    public Result updateUserRole(@Validated(SysUserRoleDTO.Update.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
-        // 判断 role.modules 是否重复
-        if (hasDuplicateIds(sysUserRoleDTO.getModules())) {
-            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "模块ID出现重复值");
-        }
-        // 更新
-        return Result.success(sysUserRoleService.updateUserRole(sysUserRoleDTO), "更新成功");
-    }
-
-    //@Operation(summary = "删除系统用户角色")
-    @PreAuthorize("@ss.hasPermi('4.1.4')")
-    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
-    @DeleteMapping("/api/system/user/deleteUserRole")
-    public Result deleteUserRole(@Validated(SysUserRoleDTO.Delete.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
-
-        // 如果角色ID: 1管理员, 2游客，则不可删除
-        Long role_id = sysUserRoleDTO.getRole_id();
-        Set<Long> filterRoles = new HashSet<>(Arrays.asList(1L, 2L));
-        if (filterRoles.contains(role_id)) {
-            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "该角色不可删除");
-        }
-
-        // 判断角色是否有关联用户，如有则不可删除
-        Map<String, Object> query = QueryNullCheckAspect.getQueryResult();
-        Long user_count = (Long) query.get("user_count");
-        if (user_count != 0) {
-            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "角色已关联 " + user_count + " 个用户，请解除关联后再删除");
-        }
-        // 删除用户 (物理删除)
-        return Result.success(sysUserRoleService.deleteUserRole(sysUserRoleDTO), "删除成功");
-    }
-
-    @PreAuthorize("@ss.hasPermi('4.1.5')")
-    @GetMapping("/api/system/user/getUserRoleModule")
-    public Result getUserRoleModule() {
-        return Result.success(sysUserRoleModuleService.queryUserRoleModule());
-    }
-}

src/main/java/com/backendsys/controller/Systems/SysUserRoleV1Controller.java

@@ -0,0 +1,106 @@
+package com.backendsys.controller.Systems;
+
+import cn.hutool.core.collection.CollUtil;
+import com.backendsys.aspect.QueryNullCheck;
+import com.backendsys.aspect.QueryNullCheckAspect;
+import com.backendsys.entity.System.SysUserRoleDTO;
+import com.backendsys.service.System.SysUserRoleModuleService;
+import com.backendsys.service.System.SysUserRoleService;
+import com.backendsys.utils.response.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统用户角色
+ */
+@Validated
+@RestController
+public class SysUserRoleV1Controller {
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+
+    @Autowired
+    private SysUserRoleModuleService sysUserRoleModuleService;
+
+    // 判断 role.modules: [{ id: 1 }, { id: 2 }]，是否有重复值
+    //public boolean hasDuplicateIds(List<LinkedHashMap<String, Object>> modules) {
+    //    List<Object> ids = CollUtil.getFieldValues(modules, "id");
+    //    return CollUtil.isNotEmpty(ids) && ids.size() != CollUtil.distinct(ids).size();
+    //}
+    public boolean hasDuplicateIds(List<Object> ids) {
+        return CollUtil.isNotEmpty(ids) && ids.size() != CollUtil.distinct(ids).size();
+    }
+
+//    // @Operation(summary = "系统用户角色列表")
+//    @PreAuthorize("@ss.hasPermi('4.1')")
+//    @GetMapping("/api/system/user/getUserRole")
+//    public Result getUserRole(@Validated PageDTO pageDTO, @Validated SysUserRoleDTO sysUserRoleDTO) {
+//        return Result.success(sysUserRoleService.queryUserRole(pageDTO.getPage_num(), pageDTO.getPage_size(), sysUserRoleDTO));
+//    }
+
+    //@Operation(summary = "系统用户角色详情")
+    @PreAuthorize("@ss.hasPermi('4.1.1')")
+    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
+    @GetMapping("/api/v1/system/user/getUserRoleDetail")
+    public Result getUserRoleDetail(@Validated(SysUserRoleDTO.Detail.class) SysUserRoleDTO sysUserRoleDTO) {
+        return Result.success(QueryNullCheckAspect.getQueryResult());
+    }
+
+//    //@Operation(summary = "创建系统用户角色")
+//    @PreAuthorize("@ss.hasPermi('4.1.2')")
+//    @PostMapping("/api/system/user/createUserRole")
+//    public Result createUserRole(@Validated(SysUserRoleDTO.Create.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
+//        // 判断 role.modules 是否重复
+//        if (hasDuplicateIds(sysUserRoleDTO.getModules())) {
+//            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "模块ID出现重复值");
+//        }
+//        // 创建
+//        return Result.success(sysUserRoleService.insertUserRole(sysUserRoleDTO), "创建成功");
+//    }
+
+//    //@Operation(summary = "更新系统用户角色")
+//    @PreAuthorize("@ss.hasPermi('4.1.3')")
+//    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
+//    @PutMapping("/api/system/user/updateUserRole")
+//    public Result updateUserRole(@Validated(SysUserRoleDTO.Update.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
+//        // 判断 role.modules 是否重复
+//        if (hasDuplicateIds(sysUserRoleDTO.getModules())) {
+//            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "模块ID出现重复值");
+//        }
+//        // 更新
+//        return Result.success(sysUserRoleService.updateUserRole(sysUserRoleDTO), "更新成功");
+//    }
+
+//    //@Operation(summary = "删除系统用户角色")
+//    @PreAuthorize("@ss.hasPermi('4.1.4')")
+//    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
+//    @DeleteMapping("/api/system/user/deleteUserRole")
+//    public Result deleteUserRole(@Validated(SysUserRoleDTO.Delete.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
+//
+//        // 如果角色ID: 1管理员, 2游客，则不可删除
+//        Long role_id = sysUserRoleDTO.getRole_id();
+//        Set<Long> filterRoles = new HashSet<>(Arrays.asList(1L, 2L));
+//        if (filterRoles.contains(role_id)) {
+//            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "该角色不可删除");
+//        }
+//
+//        // 判断角色是否有关联用户，如有则不可删除
+//        Map<String, Object> query = QueryNullCheckAspect.getQueryResult();
+//        Long user_count = (Long) query.get("user_count");
+//        if (user_count != 0) {
+//            return Result.error(ResultEnum.DATABASE_OPERATION_FAILED.getCode(), "角色已关联 " + user_count + " 个用户，请解除关联后再删除");
+//        }
+//        // 删除用户 (物理删除)
+//        return Result.success(sysUserRoleService.deleteUserRole(sysUserRoleDTO), "删除成功");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('4.1.5')")
+//    @GetMapping("/api/system/user/getUserRoleModule")
+//    public Result getUserRoleModule() {
+//        return Result.success(sysUserRoleModuleService.queryUserRoleModule());
+//    }
+}

src/main/java/com/backendsys/modules/system/controller/SysUserRoleV2Controller.java → src/main/java/com/backendsys/modules/system/controller/SysUserRoleController.java

@@ -18,7 +18,7 @@ import java.util.Arrays;
 @Validated
 @RestController
 @Tag(name = "系统用户角色")
-public class SysUserRoleV2Controller {
+public class SysUserRoleController {
 
     @Autowired
     private SysUserRoleV2Service sysUserRoleV2Service;
@@ -32,28 +32,28 @@ public class SysUserRoleV2Controller {
 
     @Operation(summary = "获取系统用户角色详情")
     @PreAuthorize("@ss.hasPermi('4.1.1')")
-    @GetMapping("/api/v2/system/user/getUserRoleDetail")
+    @GetMapping("/api/system/user/getUserRoleDetail")
     public Result getUserRoleDetail(@Validated(SysUserRoleDTO.Detail.class) SysUserRoleDTO sysUserRoleDTO) {
         return Result.success().put("data", sysUserRoleV2Service.getUserRoleDetail(sysUserRoleDTO));
     }
 
     @Operation(summary = "创建系统用户角色")
     @PreAuthorize("@ss.hasPermi('4.1.2')")
-    @PostMapping("/api/v2/system/user/createUserRole")
+    @PostMapping("/api/system/user/createUserRole")
     public Result createUserRole(@Validated(SysUserRoleDTO.Create.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
         return Result.success().put("data", sysUserRoleV2Service.insertUserRole(sysUserRoleDTO));
     }
 
     @Operation(summary = "更新系统用户角色")
     @PreAuthorize("@ss.hasPermi('4.1.3')")
-    @PutMapping("/api/v2/system/user/updateUserRole")
+    @PutMapping("/api/system/user/updateUserRole")
     public Result updateUserRole(@Validated(SysUserRoleDTO.Update.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
         return Result.success().put("data", sysUserRoleV2Service.updateUserRole(sysUserRoleDTO));
     }
 
     @Operation(summary = "删除系统用户角色")
     @PreAuthorize("@ss.hasPermi('4.1.4')")
-    @DeleteMapping("/api/v2/system/user/deleteUserRole")
+    @DeleteMapping("/api/system/user/deleteUserRole")
     public Result deleteUserRole(@Validated(SysUserRoleDTO.Delete.class) @RequestBody SysUserRoleDTO sysUserRoleDTO) {
         // 不可删除 角色ID: (1管理员, 2游客)
         if (Arrays.asList(1L, 2L).contains(sysUserRoleDTO.getRole_id())) throw new CustException("该角色不可删除");

src/main/java/com/backendsys/modules/system/controller/SysUserRoleModuleV2Controller.java → src/main/java/com/backendsys/modules/system/controller/SysUserRoleModuleController.java

@@ -16,16 +16,16 @@ import org.springframework.web.bind.annotation.RestController;
 @Validated
 @RestController
 @Tag(name = "系统用户角色模块")
-public class SysUserRoleModuleV2Controller {
+public class SysUserRoleModuleController {
 
     @Autowired
     private SysUserRoleModuleV2Service sysUserRoleModuleV2Service;
 
     @Operation(summary = "获取系统用户角色模块列表")
     @PreAuthorize("@ss.hasPermi('4.1.5')")
-    @GetMapping("/api/v2/system/user/getUserRoleModule")
-    public Result getUserRoleModule() {
-        return Result.success().put("data", sysUserRoleModuleV2Service.getUserRoleModule());
+    @GetMapping("/api/system/user/getUserRoleModule")
+    public Result getUserRoleModule(Long role_id) {
+        return Result.success().put("data", sysUserRoleModuleV2Service.getUserRoleModule(role_id));
     }
 
 }

src/main/java/com/backendsys/modules/system/dao/SysUserRoleModuleDao.java

@@ -10,6 +10,6 @@ import java.util.Map;
 @Mapper
 public interface SysUserRoleModuleDao extends BaseMapper<SysUserRoleModule> {
 
-    List<Map<String, Object>> selectUserRoleModule();
+    List<Map<String, Object>> selectUserRoleModule(Long role_id);
 
 }

src/main/java/com/backendsys/modules/system/service/SysUserRoleModuleV2Service.java

@@ -8,6 +8,6 @@ import java.util.Map;
 
 public interface SysUserRoleModuleV2Service extends IService<SysUserRoleModule> {
 
-    List<Map<String, Object>> getUserRoleModule();
+    List<Map<String, Object>> getUserRoleModule(Long role_id);
 
 }

src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleModuleV2ServiceImpl.java

@@ -17,8 +17,8 @@ public class SysUserRoleModuleV2ServiceImpl extends ServiceImpl<SysUserRoleModul
     private SysUserRoleModuleDao sysUserRoleModuleDao;
 
     @Override
-    public List<Map<String, Object>> getUserRoleModule() {
-        return sysUserRoleModuleDao.selectUserRoleModule();
+    public List<Map<String, Object>> getUserRoleModule(Long role_id) {
+        return sysUserRoleModuleDao.selectUserRoleModule(role_id);
     }
 
 }