fix: 用户新增备注/管理员重置密码/用户修改密码

谢茂盛
1 parent 82b7b5ac
Showing 8 changed files with 96 additions and 13 deletions
sql/init.sql
src/main/java/com/order/erp/controller/UserController.java
src/main/java/com/order/erp/domain/dto/admin/AdminUserDO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserModifyPwdVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserVO.java
src/main/java/com/order/erp/domain/vo/admin/ResetPwdVO.java
src/main/java/com/order/erp/service/admin/AdminUserService.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
@@ -314,6 +314,7 @@ CREATE TABLE `admin_user` (
             `avatar_name` varchar(255) DEFAULT NULL COMMENT '头像地址',
             `avatar_path` varchar(255) DEFAULT NULL COMMENT '头像真实路径',
             `password` varchar(255) DEFAULT NULL COMMENT '密码',
+            `remark` varchar(256) DEFAULT NULL COMMENT '备注信息',
             `is_admin` bit(1) DEFAULT b'0' COMMENT '是否为admin账号',
             `pwd_reset_time`  DATETIME  DEFAULT NULL COMMENT '修改密码的时间',
           `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
@@ -3,10 +3,7 @@ package com.order.erp.controller;
 import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.config.DataScope;
-import com.order.erp.domain.vo.admin.AdminAuthUserVO;
-import com.order.erp.domain.vo.admin.AdminUserQueryVO;
-import com.order.erp.domain.vo.admin.AdminUserVO;
-import com.order.erp.domain.vo.admin.UpdatePwdVO;
+import com.order.erp.domain.vo.admin.*;
 import com.order.erp.log.Log;
 import com.order.erp.service.admin.AdminUserService;
 import io.swagger.annotations.Api;
@@ -85,11 +82,20 @@ public class UserController {
  
     @Log("修改密码")
     @ApiOperation("修改密码")
+    @PostMapping(value = "/update_pass")
     @AnonymousAccess
     public ServerResult updatePass(@RequestBody @Validated UpdatePwdVO pwdVO) {
         return userService.updatePass(pwdVO);
     }
  
+    @Log("重置密码")
+    @ApiOperation("重置密码")
+    @PostMapping(value = "/reset")
+    @AnonymousAccess
+    public ServerResult reset(@RequestBody @Validated ResetPwdVO resetPwdVO) {
+        return userService.resetPwdVO(resetPwdVO);
+    }
+
     @ApiOperation("修改头像")
     @AnonymousAccess
     public ServerResult updateAvatar(@RequestParam MultipartFile file) {
@@ -83,4 +83,9 @@ public class AdminUserDO extends BaseDO implements Serializable {
      */
     private LocalDateTime pwdResetTime;
  
+    /**
+     * 备注信息
+     */
+    private String remark;
+
 }
@@ -22,16 +22,16 @@ import java.io.Serializable;
 public class AdminUserModifyPwdVO extends BasePageVO implements Serializable {
  
     /**
-     * 密钥id
+     * 手机号
      */
-    @NotBlank(message = "密钥id不存在!")
-    private String id;
+    @NotBlank(message = "手机号不能为空!")
+    private String phone;
  
     /**
-     * 密钥密码
+     * 短信验证码
      */
-    @NotBlank(message = "密钥密码不能为空")
-    private String passwordRecoverKey;
+    @NotBlank(message = "短信验证码不能为空")
+    private String smsCaptchaCode;
  
     /**
      * 密码
@@ -83,4 +83,9 @@ public class AdminUserVO implements Serializable {
      * 角色id
      */
     private Long roleId;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
 }
+package com.order.erp.domain.vo.admin;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 用户表(AdminUser)实体类
+ *
+ * @author makejava
+ * @since 2023-08-30 17:51:48
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ResetPwdVO implements Serializable {
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "密钥id不存在!")
+    private Long userId;
+
+}
+
@@ -69,6 +69,13 @@ public interface AdminUserService extends IService&lt;AdminUserDO&gt; {
     ServerResult updatePass(UpdatePwdVO pwdVO);
  
     /**
+     *
+     * @param resetPwdVO
+     * @return
+     */
+    ServerResult resetPwdVO(ResetPwdVO resetPwdVO);
+
+    /**
      * 用户名称/手机号/邮箱号
      *
      * @param userName
@@ -14,8 +14,9 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.ImgCaptchaUtils;
-import com.order.erp.common.utils.RedisUtil;
+import com.order.erp.common.utils.SmsUtils;
 import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.config.DataScope;
 import com.order.erp.domain.RoleEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.admin.*;
@@ -56,7 +57,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     private ImgCaptchaUtils imgCaptchaUtils;
  
     @Resource
-    private RedisUtil redisUtil;
+    private SmsUtils smsUtils;
  
     @Resource
     private AuthenticationManager authenticationManager;
@@ -92,6 +93,9 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     @Resource
     private TransactionHelper transactionHelper;
  
+    @Resource
+    private DataScope dataScope;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -326,6 +330,18 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         return ServerResult.success();
     }
  
+    @Override
+    public ServerResult resetPwdVO(ResetPwdVO resetPwdVO) {
+        AdminUserDO userDO = getById(resetPwdVO.getUserId());
+        if (Objects.isNull(userDO)) {
+            throw new BusinessException(ServerResultCode.USER_NOT_EXIT);
+        }
+        userDO.setPwdResetTime(LocalDateTime.now());
+        userDO.setPassword(passwordEncoder.encode("123456"));
+        updateById(userDO);
+        return ServerResult.success();
+    }
+
     /**
      * @param loginByPwdVO
      * @return
@@ -363,7 +379,19 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
  
     @Override
     public ServerResult passwordModify(AdminUserModifyPwdVO modifyPwdVO) {
-        return null;
+        smsUtils.validateSmsCaptcha(modifyPwdVO.getPhone(), modifyPwdVO.getSmsCaptchaCode());
+        if (!modifyPwdVO.getPassword().equals(modifyPwdVO.getConfirmPassword())) {
+            throw new BusinessException(ServerResultCode.MEMBER_CONFIRM_PASSWORD_ERROR);
+        }
+        AdminUserDO userDO = getOne(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getPhone, modifyPwdVO.getPhone()).last("limit 1"));
+        if (Objects.isNull(userDO)) {
+            throw new BusinessException(ServerResultCode.USER_NOT_EXIT);
+        }
+        userDO.setPwdResetTime(LocalDateTime.now());
+        userDO.setPassword(passwordEncoder.encode(modifyPwdVO.getPassword()));
+        updateById(userDO);
+        return ServerResult.success();
     }
  
     @Override