From 71c78f28371d70a0605939324f6fa5468a2ebe39 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 9 Aug 2022 17:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/AuthRoleController.java | 14 +++++++++
 .../system/ISystemAuthRoleService.java        | 11 +++++++
 .../impl/SystemAuthRoleServiceImpl.java       | 30 +++++++++++++++++--
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthRoleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthRoleController.java
index 17011708..0c3eb445 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthRoleController.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/system/AuthRoleController.java
@@ -12,6 +12,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 系统角色管理
@@ -23,6 +25,18 @@ public class AuthRoleController {
     @Resource
     ISystemAuthRoleService iSystemAuthRoleService;
 
+    /**
+     * 角色所有
+     *
+     * @author fzr
+     * @return Object
+     */
+    @GetMapping("/all")
+    public Object all() {
+        List<Map<String, Object>> list = iSystemAuthRoleService.all();
+        return AjaxResult.success(list);
+    }
+
     /**
      * 角色列表
      *
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthRoleService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthRoleService.java
index 359403b7..fafd1838 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthRoleService.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/ISystemAuthRoleService.java
@@ -6,11 +6,22 @@ import com.hxkj.admin.vo.system.SystemAuthRoleVo;
 import com.hxkj.common.core.PageResult;
 import org.springframework.validation.annotation.Validated;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 系统角色服务接口类
  */
 public interface ISystemAuthRoleService {
 
+    /**
+     * 角色所有
+     *
+     * @author fzr
+     * @return List<SystemAuthRoleVo>
+     */
+    List<Map<String, Object>> all();
+
     /**
      * 角色列表
      *
diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java
index ba975369..2f1b1b95 100644
--- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java
+++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAuthRoleServiceImpl.java
@@ -23,9 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * 系统角色服务实现类
@@ -42,6 +40,32 @@ public class SystemAuthRoleServiceImpl implements ISystemAuthRoleService {
     @Resource
     ISystemAuthPermService iSystemAuthPermService;
 
+    /**
+     * 角色所有
+     *
+     * @author fzr
+     * @return List<SystemAuthRoleVo>
+     */
+    @Override
+    public List<Map<String, Object>> all() {
+        QueryWrapper<SystemAuthRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("id,name,create_time,update_time");
+        queryWrapper.orderByDesc(Arrays.asList("sort", "id"));
+        List<SystemAuthRole> systemAuthRoles = systemAuthRoleMapper.selectList(queryWrapper);
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (SystemAuthRole systemAuthRole : systemAuthRoles) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("id", systemAuthRole.getId());
+            map.put("name", systemAuthRole.getName());
+            map.put("createTime", TimeUtil.timestampToDate(systemAuthRole.getCreateTime()));
+            map.put("updateTime", TimeUtil.timestampToDate(systemAuthRole.getUpdateTime()));
+            list.add(map);
+        }
+
+        return list;
+    }
+
     /**
      * 角色列表
      *