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 | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 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 0d1ce6e..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;
@@ -9,7 +10,6 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
-import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
@@ -17,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;
@@ -54,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
@@ -72,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());
@@ -103,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);
@@ -128,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")
@@ -142,9 +167,9 @@
}
// @PreAuthorize("@el.check('admin:edit')")
+
/**
* 淇敼绠＄悊鍛樹俊鎭�
- *
*/
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
@@ -158,8 +183,6 @@
/**
* 淇敼鎴戠殑瀵嗙爜
- * @param param
- * @return
*/
@PutMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
@@ -181,13 +204,15 @@
// return ResponseUtil.success(null);
// }
-// @DeleteMapping("/{id}")
-// @PreAuthorize("@el.check('admin:del')")
-// public ResponseVO<Object> delete(@PathVariable Long id) {
-// checkLevel(id);
-// adminService.deleteAdmin(id);
-// return ResponseUtil.success(null);
-// }
+ @PostMapping("/del/{adminId}")
+ public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
+ boolean result = adminService.deleteAdmin(adminId);
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
// /**
// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
--
Gitblit v1.9.3