From 3467040dee9e18ebd9d01263d5698f065a5591b4 Mon Sep 17 00:00:00 2001
From: root <password>
Date: Fri, 23 Oct 2020 16:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEroleId=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  5 +++
 .../common/shiro/CenterAuthShiroConfig.java   |  3 ++
 .../dh/controller/system/UserController.java  | 31 +++++++++++++++++++
 .../dh/mybatis/BaseAdminUserMapper.java       |  2 ++
 .../cetc32/dh/service/AdminUserService.java   |  2 ++
 .../dh/service/impl/AdminUserServiceImpl.java | 23 ++++++++++++++
 .../resources/mapper/BaseAdminUserMapper.xml  |  6 ++++
 7 files changed, 72 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9ea3fd3..23ddb6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,11 @@
             <artifactId>shiro-ehcache</artifactId>
             <version>1.2.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-cas</artifactId>
+            <version>1.2.6</version>
+        </dependency>
         <!--<dependency>
             <groupId>com.github.theborakompanioni</groupId>
             <artifactId>thymeleaf-extras-shiro</artifactId>
diff --git a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
index d921632..0605659 100644
--- a/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
+++ b/src/main/java/com/cetc32/dh/common/shiro/CenterAuthShiroConfig.java
@@ -11,6 +11,7 @@
 package com.cetc32.dh.common.shiro;
 
 import com.cetc32.dh.common.filter.JWTFilter;
+import org.apache.shiro.cas.CasFilter;
 import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
 import org.apache.shiro.mgt.DefaultSubjectDAO;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
@@ -134,4 +135,6 @@ public class CenterAuthShiroConfig {
     public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
         return new LifecycleBeanPostProcessor();
     }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java
index 69b5326..11204e7 100644
--- a/src/main/java/com/cetc32/dh/controller/system/UserController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/UserController.java
@@ -240,5 +240,36 @@ public class UserController {
         return data;
     }
 
+    /**
+     * 功能描述: 根据权限查询用户列表
+     * @param pageNum
+     * @param pageSize
+     * @param roleId
+     * @return:PageDataResult
+     * @auther: hubin
+     * @date: 2020/10/23
+     */
+    @RequestMapping(value = "/getUserRole", method = RequestMethod.POST)
+    @ResponseBody
+    public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,Integer roleId){
+        PageDataResult pdr = new PageDataResult();
+        try {
+            if(null == pageNum) {
+                pageNum = 1;
+            }
+            if(null == pageSize) {
+                pageSize = 10;
+            }
+            // 获取用户列表
+            pdr = adminUserService.getUserRole(roleId, pageNum ,pageSize);
+            logger.info("用户列表查询=pdr:" + pdr);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("用户列表查询异常！", e);
+        }
+        return pdr;
+    }
 
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
index c4388a9..dc9c237 100644
--- a/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/BaseAdminUserMapper.java
@@ -38,4 +38,6 @@ public interface BaseAdminUserMapper extends MyMapper<BaseAdminUser> {
 
     int updatePwd(@Param("userName") String userName, @Param("password") String password);
 
+    List<AdminUserDTO> getUserRole(@Param("roleId") Integer roleId);
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/AdminUserService.java b/src/main/java/com/cetc32/dh/service/AdminUserService.java
index d1fce1a..02ed8fb 100644
--- a/src/main/java/com/cetc32/dh/service/AdminUserService.java
+++ b/src/main/java/com/cetc32/dh/service/AdminUserService.java
@@ -37,4 +37,6 @@ public interface AdminUserService {
     Map<String, Object> delUser(Integer id, Integer status);
 
     Map<String, Object> recoverUser(Integer id, Integer status);
+
+    PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize);
 }
diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
index b53813f..d0fc710 100644
--- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
@@ -232,4 +232,27 @@ public class AdminUserServiceImpl implements AdminUserService {
         password = DigestUtils.Md5(userName,password);
         return baseAdminUserMapper.updatePwd(userName,password);
     }
+
+
+    /**
+     * 根据权限查询用户
+     * @param roleId
+     * @param pageNum
+     * @param pageSize
+     * @return PageDataResult
+     */
+    @Override
+    public PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize){
+        PageDataResult pageDataResult = new PageDataResult();
+        PageHelper.startPage(pageNum, pageSize);
+        List<AdminUserDTO> baseAdminUsers = baseAdminUserMapper.getUserRole(roleId);
+
+        if(baseAdminUsers.size() != 0){
+            PageInfo<AdminUserDTO> pageInfo = new PageInfo<>(baseAdminUsers);
+            pageDataResult.setList(baseAdminUsers);
+            pageDataResult.setTotals((int) pageInfo.getTotal());
+        }
+
+        return pageDataResult;
+    }
 }
diff --git a/src/main/resources/mapper/BaseAdminUserMapper.xml b/src/main/resources/mapper/BaseAdminUserMapper.xml
index d4fa146..2ebd8d3 100644
--- a/src/main/resources/mapper/BaseAdminUserMapper.xml
+++ b/src/main/resources/mapper/BaseAdminUserMapper.xml
@@ -90,4 +90,10 @@
     </where>
   </select>
 
+  <select id="getUserRole" resultType="com.cetc32.dh.dto.AdminUserDTO">
+    SELECT id,sys_user_name
+    from base_admin_user
+    where role_id = #{roleId}
+  </select>
+
 </mapper>
\ No newline at end of file
-- 
Gitee