From 66e0f592475cebf0511be54f71217be5ba4245c8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 二月 2022 14:11:25 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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..7cce0e2 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;
 
 /**
@@ -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