From 7e6bcf78c99a507454a07000b00e86ab1f9213c8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 三月 2022 10:14:57 +0800
Subject: [PATCH] bug修复

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 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..2c3b135 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
@@ -9,7 +9,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;
@@ -22,9 +21,11 @@
 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.ClientService;
 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.Client;
 import com.sandu.ximon.dao.domain.Menu;
 import com.sandu.ximon.dao.domain.Role;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -36,7 +37,10 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -54,6 +58,7 @@
     private final MenuService menuService;
     private final PasswordEncoder passwordEncoder;
     private final AdminService adminService;
+    private final ClientService clientService;
     private final RoleService roleService;
     private final TokenProvider tokenProvider;
 
@@ -72,7 +77,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 +108,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);
@@ -142,9 +158,9 @@
     }
 
 //    @PreAuthorize("@el.check('admin:edit')")
+
     /**
      * 淇敼绠＄悊鍛樹俊鎭�
-     *
      */
     @PostMapping("/update/{adminId}")
     public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
@@ -158,8 +174,6 @@
 
     /**
      * 淇敼鎴戠殑瀵嗙爜
-     * @param param
-     * @return
      */
     @PutMapping("/updateMyPassword")
     public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
@@ -181,13 +195,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