From 75a6e51e68845be048acf4fdccfd554c8afc7a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=89=91=E9=9B=A8?= <2375294554@qq.com>
Date: Tue, 25 Mar 2025 16:50:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=B1=82=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=EF=BC=8C=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=8C=E6=9F=A5=E6=89=BE=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?=
 =?UTF-8?q?=20--AdminController.java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/contrloler/AdminController.java     | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java
index 906c1202..7e2c7b1e 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/admin/contrloler/AdminController.java
@@ -32,14 +32,14 @@ public class AdminController {
     private final SysUserService sysUserService;
 
     @GetMapping("/users")
-    @Operation(summary = "分页查找")
+    @Operation(summary = "分页查找用户")
     @RequiresPermissions("sys:role:superAdmin")
     @Parameters({
             @Parameter(name = "mobile", description = "用户手机号码", required = true),
             @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
             @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
     })
-    public Result<PageData<AdminPageUserVO>> page(
+    public Result<PageData<AdminPageUserVO>> pageUser(
             @Parameter(hidden = true) @RequestParam Map<String, Object> params) {
         AdminPageUserDTO dto = new AdminPageUserDTO();
         dto.setMobile((String) params.get("mobile"));
@@ -56,6 +56,29 @@ public class AdminController {
     @RequiresPermissions("sys:role:superAdmin")
     public Result<Void> update(
             @PathVariable Long id) {
+        sysUserService.resetPassword(id);
         return new Result<>();
     }
+
+    @DeleteMapping("/users/{id}")
+    @Operation(summary = "用户删除")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> delete(@PathVariable Long id) {
+        sysUserService.delete(new Long[]{id});
+        return new Result<>();
+    }
+
+    @GetMapping("/device/all")
+    @Operation(summary = "分页查找设备")
+    @RequiresPermissions("sys:role:superAdmin")
+    @Parameters({
+            @Parameter(name = "keywords", description = "用户手机号码", required = true),
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
+    })
+    public Result<Void> pageDevice(
+            @Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+        //TODO 等设备功能模块写好
+        return new Result<Void>().error(600,"等设备功能模块写好");
+    }
 }