Add SysUserRoleV2

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

@@ -1,11 +1,8 @@
 package com.backendsys.modules.system.controller;
 
 import com.backendsys.modules.common.utils.Result;
-import com.backendsys.modules.system.dao.SysUserRoleModuleDao;
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleModule;
 import com.backendsys.modules.system.service.SysUserRoleModuleV2Service;
-import com.backendsys.service.System.SysUserRoleModuleService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -22,18 +19,14 @@ public class SysUserRoleModuleV2Controller {
     @Autowired
     private SysUserRoleModuleV2Service sysUserRoleModuleV2Service;
 
-//    @Autowired
-//    private SysUserRoleModuleDao sysUserRoleModuleDao;
-
+    @Operation(summary = "获得系统用户角色模块列表")
     @PreAuthorize("@ss.hasPermi('4.1.5')")
     @GetMapping("/api/v2/system/user/getUserRoleModule")
     public Result getUserRoleModule() {
-//        QueryWrapper<SysUserRoleModule> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.orderByAsc("sort");
-//        return Result.success().put("data", sysUserRoleModuleDao.selectList(queryWrapper));
-
         return Result.success().put("data", sysUserRoleModuleV2Service.getUserRoleModule());
-
     }
 
+
+
+
 }

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

@@ -1,6 +1,16 @@
 package com.backendsys.modules.system.controller;
 
+import com.backendsys.aspect.QueryNullCheck;
+import com.backendsys.aspect.QueryNullCheckAspect;
+import com.backendsys.entity.PageDTO;
+import com.backendsys.modules.common.utils.Result;
+import com.backendsys.entity.System.SysUserRoleDTO;
+import com.backendsys.modules.system.service.SysUserRoleV2Service;
+import com.backendsys.service.System.SysUserRoleService;
+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.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -10,6 +20,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class SysUserRoleV2Controller {
 
+    @Autowired
+    private SysUserRoleV2Service sysUserRoleV2Service;
 
+    @PreAuthorize("@ss.hasPermi('4.1')")
+    @GetMapping("/api/v2/system/user/getUserRole")
+    public Result getUserRole(@Validated SysUserRoleDTO sysUserRoleDTO) {
+        return Result.success().put("data", sysUserRoleV2Service.getUserRole(sysUserRoleDTO));
+    }
+
+//    @PreAuthorize("@ss.hasPermi('4.1.1')")
+//    @QueryNullCheck(serviceClass = SysUserRoleService.class, serviceMethod = "queryUserRoleDetail", argField = "role_id", message = "用户角色不存在")
+//    @GetMapping("/api/system/user/getUserRoleDetail")
+//    public com.backendsys.utils.response.Result getUserRoleDetail(@Validated(SysUserRoleDTO.Detail.class) SysUserRoleDTO sysUserRoleDTO) {
+//        return com.backendsys.utils.response.Result.success(QueryNullCheckAspect.getQueryResult());
+//    }
 
 }

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

@@ -1,5 +1,7 @@
 package com.backendsys.modules.system.dao;
 
+import com.backendsys.entity.System.SysUserRoleDTO;
+import com.backendsys.modules.system.entity.SysUser.SysUserInfo;
 import com.backendsys.modules.system.entity.SysUser.SysUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -9,6 +11,9 @@ import java.util.Map;
 
 @Mapper
 public interface SysUserRoleDao extends BaseMapper<SysUserRole> {
+
+    List<SysUserRole> selectUserRoleList(SysUserRoleDTO sysUserRoleDTO);
+
     // 获得用户角色
     List<Map<String, Object>> selectRoleByUserId(Long user_id);
 }

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

@@ -1,7 +1,14 @@
 package com.backendsys.modules.system.service;
 
+import com.backendsys.entity.System.SysUserRoleDTO;
 import com.backendsys.modules.system.entity.SysUser.SysUserRole;
+import com.backendsys.utils.response.PageEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 public interface SysUserRoleV2Service extends IService<SysUserRole> {
+
+    PageEntity getUserRole(SysUserRoleDTO sysUserRoleDTO);
+
 }

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

@@ -1,18 +1,32 @@
 package com.backendsys.modules.system.service.impl;
 
+import com.backendsys.entity.System.SysUserRoleDTO;
 import com.backendsys.modules.system.dao.SysUserRoleDao;
+import com.backendsys.modules.system.entity.SysUser.SysUserInfo;
 import com.backendsys.modules.system.entity.SysUser.SysUserRole;
 import com.backendsys.modules.system.service.SysUserRoleV2Service;
+import com.backendsys.utils.response.PageEntity;
+import com.backendsys.utils.response.PageInfoResult;
+import com.backendsys.utils.v2.PageUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserRole> implements SysUserRoleV2Service {
 
     @Autowired
     private SysUserRoleDao sysUserRoleDao;
 
-
+    @Override
+    public PageEntity getUserRole(SysUserRoleDTO sysUserRoleDTO) {
+        // 分页
+        PageUtils.startPage();
+        List<SysUserRole> list = sysUserRoleDao.selectUserRoleList(sysUserRoleDTO);
+        return new PageInfoResult(list).toEntity();
+    }
 
 }

src/main/resources/mapper/system/SysUserRoleDao.xml

@@ -2,11 +2,45 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.backendsys.modules.system.dao.SysUserRoleDao">
 
+    <sql id="includeUserRole">
+        ur.id id,
+        ur.id role_id,
+        ur.role_name role_name,
+        COALESCE(ur.role_description, '') role_description,
+        ur.sort sort,
+        ur.status status
+    </sql>
+    <resultMap id="resultMapUserRoleList" type="java.util.LinkedHashMap">
+        <id property="id" column="id" jdbcType="BIGINT" />
+        <result property="role_id" column="role_id" javaType="java.lang.Long"/>
+        <result property="role_name" column="role_name" />
+        <result property="role_description" column="role_description" />
+        <result property="user_count" column="user_count" />
+        <result property="sort" column="sort" />
+        <result property="status" column="status" javaType="java.lang.Integer"/>
+    </resultMap>
+    <select id="selectUserRoleList" resultMap="resultMapUserRoleList">
+        SELECT <include refid="includeUserRole" />, COUNT(us.id) user_count
+        FROM sys_user_role ur
+        LEFT JOIN sys_user_role_relation urr ON ur.id = urr.role_id
+        LEFT JOIN sys_user us ON us.id = urr.user_id
+        <where>
+            <if test="role_name != null and role_name != ''">
+                AND ur.role_name LIKE CONCAT('%', #{role_name}, '%')
+            </if>
+            <if test="status != null and status != ''">
+                AND ur.status = #{status}
+            </if>
+        </where>
+        GROUP BY ur.id, ur.role_name
+        ORDER BY ur.sort ASC
+    </select>
+
+
     <resultMap id="resultMapUserRole" type="java.util.LinkedHashMap">
         <result property="role_id" column="role_id" javaType="java.lang.Long" />
         <result property="role_name" column="role_name" />
     </resultMap>
-
     <select id="selectRoleByUserId" resultMap="resultMapUserRole">
         SELECT
             surr.role_id role_id,