修改角色管理查询

src/main/java/org/rcisoft/sys/sysrole/controller/SysRoleController.java

@@ -6,10 +6,13 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.rcisoft.core.anno.CyOpeLogAnno;
+import org.rcisoft.core.model.CyGridModel;
 import org.rcisoft.core.operlog.enums.CyLogTypeEnum;
 import org.rcisoft.sys.rbac.role.entity.SysRoleRbac;
 import org.rcisoft.sys.sysrole.service.SysRoleService;
+import org.rcisoft.sys.wbac.role.dto.SysRoleDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import org.rcisoft.core.result.CyResult;
@@ -55,5 +58,18 @@ public class SysRoleController extends CyPaginationController<SysRoleRbac> {
         sysRole);
     }
 
-
+    @PreAuthorize("@cyPerm.hasPerm('sys:role:list')")
+    @CyOpeLogAnno(
+            title = "system-角色管理-查询角色",
+            businessType = CyLogTypeEnum.QUERY
+    )
+    @ApiOperation(
+            value = "分页查询角色",
+            notes = "分页查询角色"
+    )
+    @GetMapping({"/list"})
+    public CyGridModel listByPagination(SysRoleDTO sysRoleDTO) {
+        sysRoleServiceImpl.findAllByPagination(getPaginationUtility(), sysRoleDTO);
+        return this.getGridModelResponse();
+    }
 }

src/main/java/org/rcisoft/sys/sysrole/dao/SysRoleMapper.java

+package org.rcisoft.sys.sysrole.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.core.mapper.CyBaseMapper;
+import org.rcisoft.core.model.CyPageInfo;
+import org.rcisoft.sys.wbac.role.dto.SysRoleDTO;
+import org.rcisoft.sys.wbac.role.entity.SysRole;
+
+@Mapper
+public interface SysRoleMapper extends CyBaseMapper<SysRole> {
+
+    IPage<SysRole> querySysRolesPaged(CyPageInfo var1, @Param("dto") SysRoleDTO var2);
+
+}

src/main/java/org/rcisoft/sys/sysrole/service/SysRoleService.java

 package org.rcisoft.sys.sysrole.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.rcisoft.core.model.CyPageInfo;
 import org.rcisoft.sys.rbac.role.entity.SysRoleRbac;
 import org.rcisoft.core.model.CyPersistModel;
-
+import org.rcisoft.sys.wbac.role.dto.SysRoleDTO;
+import org.rcisoft.sys.wbac.role.entity.SysRole;
 
 
 /**
@@ -28,4 +31,6 @@ public interface SysRoleService {
     CyPersistModel merge(SysRoleRbac sysRole);
 
 
+    IPage<SysRole> findAllByPagination(CyPageInfo<SysRoleRbac> var1, SysRoleDTO var2);
+
 }

src/main/java/org/rcisoft/sys/sysrole/service/impl/SysRoleServiceImpl.java

 package org.rcisoft.sys.sysrole.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.rcisoft.core.exception.CyServiceException;
+import org.rcisoft.core.model.CyPageInfo;
+import org.rcisoft.core.util.CyEscapeUtil;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.sys.rbac.role.dao.SysRoleMenuRbacRepository;
@@ -11,7 +14,10 @@ import org.rcisoft.sys.rbac.role.dto.SysRoleRbacDTO;
 import org.rcisoft.sys.rbac.role.entity.SysRoleMenuRbac;
 import org.rcisoft.sys.rbac.role.entity.SysRoleRbac;
 
+import org.rcisoft.sys.sysrole.dao.SysRoleMapper;
 import org.rcisoft.sys.sysrole.service.SysRoleService;
+import org.rcisoft.sys.wbac.role.dto.SysRoleDTO;
+import org.rcisoft.sys.wbac.role.entity.SysRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -33,6 +39,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleRbacRepository,SysRol
 
     @Autowired
     private SysRoleMenuRbacRepository sysRoleMenuRbacRepository;
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     /**
     * 保存 角色信息表
     * @param sysRole
@@ -117,6 +126,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleRbacRepository,SysRol
                 sysRole.getBusinessId() + "的角色表信息");
         return new CyPersistModel(line);
     }
-
-
+    @Override
+    public IPage<SysRole> findAllByPagination(CyPageInfo<SysRoleRbac> paginationUtility, SysRoleDTO sysRoleDTO) {
+        sysRoleDTO.setDeleted();
+        sysRoleDTO.setRoleName(CyEscapeUtil.sqlEscape(sysRoleDTO.getRoleName()));
+        sysRoleDTO.setRoleKey(CyEscapeUtil.sqlEscape(sysRoleDTO.getRoleKey()));
+        return sysRoleMapper.querySysRolesPaged(paginationUtility, sysRoleDTO);
+    }
 }

src/main/resources/mapper/SysRoleMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.rcisoft.sys.sysrole.dao.SysRoleMapper">
+    <resultMap id="BaseResultMap" type="org.rcisoft.sys.wbac.role.entity.SysRole">
+        <id column="business_id" jdbcType="INTEGER" property="businessId"/>
+        <result column="role_name" jdbcType="VARCHAR" property="roleName"/>
+        <result column="role_key" jdbcType="VARCHAR" property="roleKey"/>
+        <result column="role_sort" jdbcType="INTEGER" property="roleSort"/>
+        <result column="menu_check_strictly" jdbcType="TINYINT" property="menuCheckStrictly"/>
+
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+        <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
+        <result column="flag" jdbcType="VARCHAR" property="flag"/>
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+
+    </resultMap>
+
+    <select id="querySysRolesPaged" resultMap="BaseResultMap" databaseId="mysql">
+        select distinct sr.business_id, sr.role_name, sr.role_key, sr.role_sort, sr.menu_check_strictly,
+        sr.flag, sr.del_flag, sr.create_date, sr.remarks
+        from sys_role sr
+        where
+        1=1
+            and sr.del_flag = 0
+        <if test="dto.flag !=null and dto.flag != '' ">
+            and sr.flag = #{dto.flag}
+        </if>
+        <if test="dto.roleName !=null and dto.roleName != '' ">
+            and sr.role_name like concat('%',#{dto.roleName},'%')
+        </if>
+        <if test="dto.roleKey !=null and dto.roleKey != '' ">
+            and sr.role_key like concat('%',#{dto.roleKey},'%')
+        </if>
+        <if test="dto.beginTime != null"><!-- 开始时间检索 -->
+            and date_format(sr.create_date,'%Y-%m-%d') &gt;= date_format(#{dto.beginTime},'%Y-%m-%d')
+        </if>
+        <if test="dto.endTime != null"><!-- 结束时间检索 -->
+            and date_format(sr.create_date,'%Y-%m-%d') &lt;= date_format(#{dto.endTime},'%Y-%m-%d')
+        </if>
+        order by sr.role_sort
+    </select>
+
+</mapper>
\ No newline at end of file