From 3359950ff083b219d39b2ea6e375896b25b79efa Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 三月 2022 17:38:11 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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..895f405 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;
@@ -36,7 +35,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;
/**
@@ -72,7 +74,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());
@@ -142,9 +144,9 @@
}
// @PreAuthorize("@el.check('admin:edit')")
+
/**
* 淇敼绠＄悊鍛樹俊鎭�
- *
*/
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
@@ -158,8 +160,6 @@
/**
* 淇敼鎴戠殑瀵嗙爜
- * @param param
- * @return
*/
@PutMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
@@ -181,13 +181,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