From 10d8cb5b0e834d33455466f4a6b7d552f980c5dd Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 31 三月 2022 12:01:42 +0800
Subject: [PATCH] 管理员列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 7cce0e2..7988077 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
@@ -16,16 +17,14 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.dto.AdminDto;
+import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.AdminService;
-import com.sandu.ximon.admin.service.MenuService;
-import com.sandu.ximon.admin.service.RoleService;
-import com.sandu.ximon.dao.domain.Admin;
-import com.sandu.ximon.dao.domain.Menu;
-import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.admin.service.*;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -35,10 +34,7 @@
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -56,8 +52,10 @@
private final MenuService menuService;
private final PasswordEncoder passwordEncoder;
private final AdminService adminService;
+ private final ClientService clientService;
private final RoleService roleService;
private final TokenProvider tokenProvider;
+ private final AdminRoleRelationService adminRoleRelationService;
@AnonymousAccess
@@ -74,7 +72,7 @@
return ResponseUtil.error(ResponseStatusEnums.DISABLE_ACCOUNT.getCode(), ResponseStatusEnums.DISABLE_ACCOUNT.getMessage());
}
- Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId());
+ Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(admin.getId(), true);
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setUserId(admin.getId());
@@ -105,13 +103,24 @@
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
Long userId = SecurityUtils.getUserId();
- Admin admin = adminService.getById(userId);
- List<Role> roles = roleService.listByAdminId(admin.getId());
+ List<Role> roles;
+ MapBuilder<Object, Object> builder;
+ if (AdministratorEnums.ADMIN.equals(SecurityUtils.getAdministratorIdentity())
+ || AdministratorEnums.CUSTOMER.equals(SecurityUtils.getAdministratorIdentity())) {
+ Admin admin = adminService.getById(userId);
+ roles = roleService.listByAdminId(admin.getId());
+ builder = MapUtil.builder().put("admin", admin);
+
+ } else {
+ Client client = clientService.getById(userId);
+ roles = roleService.listByClientId(client.getId());
+ builder = MapUtil.builder().put("admin", client);
+
+ }
if (CollectionUtil.isEmpty(roles)) {
return ResponseUtil.fail("鐢ㄦ埛娌℃湁瑙掕壊锛屾棤娉曡幏鍙栨暟鎹�");
}
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
- MapBuilder<Object, Object> builder = MapUtil.builder().put("admin", admin);
if (CollectionUtil.isNotEmpty(menus)) {
List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0 || menu.getType() == 1).collect(Collectors.toList());
builder.put("menus", collect);
@@ -130,7 +139,21 @@
});
}
List<Admin> list = adminService.list(wrapper);
- return ResponseUtil.successPage(list);
+
+ List<AdminDto> adminDtoList = new ArrayList<>();
+ for (Admin demo : list) {
+ AdminDto adminDto = new AdminDto();
+ BeanUtil.copyProperties(demo, adminDto);
+ AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
+ .eq(AdminRoleRelation::getAdminId, demo.getId()));
+
+ if (one != null) {
+ adminDto.setRoleId(one.getRoleId());
+ }
+ adminDtoList.add(adminDto);
+
+ }
+ return ResponseUtil.successPage(adminDtoList);
}
@PostMapping("/register")
--
Gitblit v1.9.3