From b254118bf515a4ad125c40240101559557068b59 Mon Sep 17 00:00:00 2001
From: dute7liang <383200134@qq.com>
Date: Mon, 1 Jan 2024 16:07:19 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/cai/controller/admin/UserController.java   | 8 ++++++++
 ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java   | 8 --------
 .../com/ruoyi/cai/dto/admin/query/ResetPasswordReq.java  | 9 +++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/ResetPasswordReq.java

diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java
index c144defb..d2abd06c 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java
@@ -3,6 +3,7 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.User;
+import com.ruoyi.cai.dto.admin.query.ResetPasswordReq;
 import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
 import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
 import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
@@ -89,6 +90,13 @@ public class UserController extends BaseController {
         return toAjax(userAdminManager.updateUser(bo));
     }
 
+    @PostMapping("/resetPwd")
+    public R<Void> resetPwd(@RequestBody ResetPasswordReq req) {
+        User user = userService.getById(req.getUserId());
+        userService.resetPassword(user.getMobile(),user.getPassword());
+        return R.ok();
+    }
+
     /**
      * 删除用户
      *
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java
index 4d1d39fe..c534e832 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/User.java
@@ -41,10 +41,6 @@ public class User implements Serializable {
      *
      */
     private String password;
-    /**
-     * 密码盐
-     */
-    private String salt;
     /**
      * 组别ID
      */
@@ -53,10 +49,6 @@ public class User implements Serializable {
      * 手机号
      */
     private String mobile;
-    /**
-     * 手机号验证状态  0 未验证   1 已验证
-     */
-    private Integer mobileStatus;
     /**
      * 头像
      */
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/ResetPasswordReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/ResetPasswordReq.java
new file mode 100644
index 00000000..c6ff7ed9
--- /dev/null
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/query/ResetPasswordReq.java
@@ -0,0 +1,9 @@
+package com.ruoyi.cai.dto.admin.query;
+
+import lombok.Data;
+
+@Data
+public class ResetPasswordReq {
+    private Long userId;
+    private String password;
+}