Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/com/order/erp/controller/OrderProfitController.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/order/erp/controller/OrderProfitController.java
zhongnanhuang
2 parents 058c6902 8fa26a5a
Showing 20 changed files with 159 additions and 109 deletions
sql/init.sql
src/main/java/com/order/erp/AdminApplication.java
src/main/java/com/order/erp/config/WebConfig.java
src/main/java/com/order/erp/controller/AuditController.java
src/main/java/com/order/erp/controller/CaptchaController.java
src/main/java/com/order/erp/controller/IndexController.java
src/main/java/com/order/erp/controller/LocalStorageController.java
src/main/java/com/order/erp/controller/LoginController.java
src/main/java/com/order/erp/controller/OrderAuditLogController.java
src/main/java/com/order/erp/controller/OrderController.java
src/main/java/com/order/erp/controller/OrderFieldLockApplyController.java
src/main/java/com/order/erp/controller/OrderOptLogController.java
src/main/java/com/order/erp/controller/SysLogController.java
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-删除',
@@ -12,6 +12,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 /**
  * @author: xms
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.order.erp"})
 @MapperScan("com.order.erp.**.mapper")
 @EnableTransactionManagement
+@EnableSwagger2
 public class AdminApplication {
     private static void setLogPath() {
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import java.nio.charset.StandardCharsets;
@@ -81,4 +82,15 @@ public class WebConfig implements WebMvcConfigurer {
         fastConverter.setDefaultCharset(StandardCharsets.UTF_8);
         return fastConverter;
     }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/**").addResourceLocations(
+                "classpath:/static/");
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations(
+                "classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations(
+                "classpath:/META-INF/resources/webjars/");
+        WebMvcConfigurer.super.addResourceHandlers(registry);
+    }
 }
@@ -6,6 +6,8 @@ import com.order.erp.domain.AuditStatusEnum;
 import com.order.erp.domain.vo.order.AuditVO;
 import com.order.erp.domain.vo.order.OrderFieldLockApplyQueryVO;
 import com.order.erp.service.order.OrderFieldLockApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +22,7 @@ import javax.annotation.Resource;
  * @author makejava
  * @since 2023-09-08 15:26:43
  */
+@Api(tags = "审批管理")
 @RestController
 @RequestMapping("/order/erp/audit")
 public class AuditController {
@@ -36,6 +39,7 @@ public class AuditController {
      * @return 查询结果
      */
     @PostMapping("/list_by_page")
+    @ApiOperation("分页查询")
     @AnonymousAccess
     public ServerResult listByPage(@RequestBody @Validated OrderFieldLockApplyQueryVO queryVO) {
         return applyService.listByPage(queryVO);
@@ -47,6 +51,7 @@ public class AuditController {
      * @param queryVO 查询条件
      * @return 查询结果
      */
+    @ApiOperation("待审批列表")
     @PostMapping("/wait_audit_list")
     @AnonymousAccess
     public ServerResult waitAuditList(@RequestBody @Validated OrderFieldLockApplyQueryVO queryVO) {
@@ -60,6 +65,7 @@ public class AuditController {
      * @param queryVO 查询条件
      * @return 查询结果
      */
+    @ApiOperation("已审批列表")
     @PostMapping("/audit_list")
     @AnonymousAccess
     public ServerResult auditList(@RequestBody @Validated OrderFieldLockApplyQueryVO queryVO) {
@@ -73,6 +79,7 @@ public class AuditController {
      * @param auditVO 查询条件
      * @return 查询结果
      */
+    @ApiOperation("审核")
     @PostMapping("/do_audit")
     @AnonymousAccess
     public ServerResult doAudit(@RequestBody @Validated AuditVO auditVO) {
@@ -6,6 +6,8 @@ import com.order.erp.common.utils.ImgCaptchaUtils;
 import com.order.erp.common.utils.SmsUtils;
 import com.order.erp.domain.vo.CaptchaMessageVO;
 import com.wf.captcha.ArithmeticCaptcha;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,7 @@ import java.util.Map;
  * @since 2023-08-22 17:02:39
  */
 @RestController
+@Api(tags = "验证码")
 @RequestMapping("/order/erp/captcha")
 public class CaptchaController {
@@ -39,6 +42,7 @@ public class CaptchaController {
      * @return 查询结果
      */
     @AnonymousAccess
+    @ApiOperation("获取验证码")
     @PostMapping("/send_captcha_code")
     public ServerResult sendCaptchaCode(@RequestBody @Validated CaptchaMessageVO msgVo) {
         return smsUtils.sendCaptchaCode(msgVo);
@@ -50,6 +54,7 @@ public class CaptchaController {
      * @return 查询结果
      */
     @AnonymousAccess
+    @ApiOperation("获取图片验证码")
     @PostMapping("/get_img_captcha_code")
     public ServerResult getImgCaptchaCode() {
         // 算术类型 https://gitee.com/whvse/EasyCaptcha
@@ -7,6 +7,8 @@ import com.order.erp.service.order.OrderBaseInfoService;
 import com.order.erp.service.order.OrderCompletionReportService;
 import com.order.erp.service.order.OrderInspectionStageService;
 import com.order.erp.service.order.OrderProfitAnalysisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,6 +24,7 @@ import java.util.Map;
  * @description 首页
  * @date 2023/10/23 16:44:55
  */
+@Api(tags = "首页")
 @RestController
 @RequestMapping("/order/erp/index")
 public class IndexController {
@@ -39,6 +42,7 @@ public class IndexController {
     OrderCompletionReportService orderCompletionReportService;
     @GetMapping("/data")
+    @ApiOperation("首页统计数据")
     public ServerResult getData(){
         //订单总完成数
         long orderTotalFinished = orderBaseInfoService.countByOrderStatus(OrderStatusEnum.ORDER_FINISH.getStatus());
@@ -79,6 +83,7 @@ public class IndexController {
     }
     @GetMapping("/chartData")
+    @ApiOperation("首页订单趋势")
     public ServerResult getChartData(){
         //订单趋势数据
         List<Map<String,Integer>> chartData = orderBaseInfoService.countDaysOrder();
@@ -3,6 +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.service.LocalStorageService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,6 +17,7 @@ import javax.annotation.Resource;
  *
  */
 @RestController
+@Api(tags = "文件上传")
 @RequestMapping("/api/localStorage")
 public class LocalStorageController {
@@ -7,6 +7,7 @@ import com.order.erp.log.Log;
 import com.order.erp.security.TokenProvider;
 import com.order.erp.security.service.OnlineUserService;
 import com.order.erp.service.admin.AdminUserService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -37,6 +38,7 @@ public class LoginController {
      * @return 查询结果
      */
     @AnonymousAccess
+    @ApiOperation("手机注册")
     @PostMapping("/phone_register")
     public ServerResult phoneRegister(@RequestBody @Validated AdminUserRegisterVO registerVO) {
         return userService.phoneRegister(registerVO);
@@ -49,6 +51,7 @@ public class LoginController {
      * @return 查询结果
      */
     @AnonymousAccess
+    @ApiOperation("手机登录")
     @PostMapping("/login_by_phone")
     public ServerResult loginByPhone(@RequestBody @Validated AdminUserLoginByPhoneVO loginByPhoneVO) {
         return userService.loginByPhone(loginByPhoneVO);
@@ -62,6 +65,7 @@ public class LoginController {
      */
     @AnonymousAccess
     @Log("用户登录")
+    @ApiOperation("用户登录")
     @PostMapping("/login_by_pwd")
     public ServerResult loginByPwd(@RequestBody @Validated AdminUserLoginByPwdVO loginByPwdVO) {
         return userService.loginByPwd(loginByPwdVO);
@@ -86,6 +90,7 @@ public class LoginController {
      * @return 查询结果
      */
     @AnonymousAccess
+    @ApiOperation("用户登录")
     @PostMapping("/password_modify")
     public ServerResult passwordModify(@RequestBody @Validated AdminUserModifyPwdVO modifyPwdVO) {
         return userService.passwordModify(modifyPwdVO);
@@ -98,6 +103,7 @@ public class LoginController {
      * @return 查询结果
      */
     @AnonymousAccess
+    @ApiOperation("退出登录")
     @PostMapping("/login_out")
     public ServerResult loginOut(HttpServletRequest request) {
         onlineUserService.logout(tokenProvider.getToken(request));
@@ -4,6 +4,8 @@ import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.vo.order.OrderAuditLogQueryVO;
 import com.order.erp.service.order.OrderAuditLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +20,7 @@ import javax.annotation.Resource;
  * @author makejava
  * @since 2023-09-08 15:26:41
  */
+@Api(tags = "用户订单审批日志")
 @RestController
 @RequestMapping("/order/erp/audit/log")
 public class OrderAuditLogController {
@@ -34,6 +37,7 @@ public class OrderAuditLogController {
      * @return 查询结果
      */
     @PostMapping("/list")
+    @ApiOperation("分页查询")
     @AnonymousAccess
     public ServerResult list(@RequestBody @Validated OrderAuditLogQueryVO orderAuditLogQueryVO) {
         return orderAuditLogService.list(orderAuditLogQueryVO);
@@ -46,6 +50,7 @@ public class OrderAuditLogController {
      * @return 单条数据
      */
     @PostMapping("/query_by_id")
+    @ApiOperation("通过主键查询单条数据")
     @AnonymousAccess
     public ServerResult queryById(@RequestBody OrderAuditLogQueryVO orderAuditLogQueryVO) {
         return orderAuditLogService.queryById(orderAuditLogQueryVO);
@@ -5,6 +5,8 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.service.order.OrderBaseInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -21,6 +23,7 @@ import java.io.IOException;
  * @author makejava
  * @since 2023-09-08 15:26:43
  */
+@Api(tags = "订单管理")
 @RestController
 @RequestMapping("/order/erp/order")
 public class OrderController {
@@ -37,6 +40,7 @@ public class OrderController {
      * @return 查询结果
      */
     @PostMapping("/list_by_page")
+    @ApiOperation("分页查询")
     @AnonymousAccess
     public ServerResult listByPage(@RequestBody @Validated OrderBaseInfoQueryVO orderBaseInfoQueryVO) {
         return orderBaseInfoService.listByPage(orderBaseInfoQueryVO);
@@ -49,6 +53,7 @@ public class OrderController {
      * @return 查询结果
      */
     @PostMapping("/export")
+    @ApiOperation("导出订单")
     @AnonymousAccess
     public ServerResult export(HttpServletResponse response, @RequestBody @Validated OrderBaseInfoQueryVO orderBaseInfoQueryVO) throws IOException, Excel4JException {
         return orderBaseInfoService.export(response, orderBaseInfoQueryVO);
@@ -72,6 +77,7 @@ public class OrderController {
      * @return 新增结果
      */
     @PostMapping("/add")
+    @ApiOperation("新增数据")
     @AnonymousAccess
     public ServerResult add(@RequestBody OrderAddVO orderAddVO) {
         return orderBaseInfoService.add(orderAddVO);
@@ -84,6 +90,7 @@ public class OrderController {
      * @return 查询结果
      */
     @PostMapping("/field_unlock_apply")
+    @ApiOperation("字段解锁申请")
     @AnonymousAccess
     public ServerResult fieldUnlockApply(@RequestBody @Validated OrderUnlockFieldApplyVO fieldVO) {
         return orderBaseInfoService.fieldUnlockApply(fieldVO);
@@ -96,6 +103,7 @@ public class OrderController {
      * @param updateVO 数据VO
      * @return 编辑结果
      */
+    @ApiOperation("编辑数据")
     @PostMapping("/edit")
     public ServerResult edit(@RequestBody OrderUpdateVO updateVO) {
         return orderBaseInfoService.edit(updateVO);
@@ -107,6 +115,7 @@ public class OrderController {
      * @param orderBaseInfoQueryVO 查询条件
      * @return 删除是否成功
      */
+    @ApiOperation("删除数据")
     @PostMapping("/delete_by_id")
     public ServerResult deleteById(@RequestBody OrderBaseInfoQueryVO orderBaseInfoQueryVO) {
         return orderBaseInfoService.deleteById(orderBaseInfoQueryVO);
@@ -5,6 +5,8 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.vo.order.OrderFieldLockApplyQueryVO;
 import com.order.erp.domain.vo.order.OrderFieldLockApplyVO;
 import com.order.erp.service.order.OrderFieldLockApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +21,7 @@ import javax.annotation.Resource;
  * @author makejava
  * @since 2023-09-08 15:26:44
  */
+@Api(tags = "用户订单-字段锁定申请（忽略）")
 @RestController
 @RequestMapping("/order/erp/apply")
 public class OrderFieldLockApplyController {
@@ -35,58 +38,11 @@ public class OrderFieldLockApplyController {
      * @return 查询结果
      */
     @PostMapping("/list")
+    @ApiOperation("分页查询")
     @AnonymousAccess
     public ServerResult list(@RequestBody @Validated OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO) {
         return orderFieldLockApplyService.list(orderFieldLockApplyQueryVO);
     }
-    /**
-     * 通过主键查询单条数据
-     *
-     * @param orderFieldLockApplyQueryVO 查询条件
-     * @return 单条数据
-     */
-    @PostMapping("/query_by_id")
-    @AnonymousAccess
-    public ServerResult queryById(@RequestBody OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO) {
-        return orderFieldLockApplyService.queryById(orderFieldLockApplyQueryVO);
-    }
-
-    /**
-     * 新增数据
-     *
-     * @param orderFieldLockApplyVO 数据VO
-     * @return 新增结果
-     */
-    @PostMapping("/add")
-    @AnonymousAccess
-    public ServerResult add(@RequestBody OrderFieldLockApplyVO orderFieldLockApplyVO) {
-        return orderFieldLockApplyService.add(orderFieldLockApplyVO);
-    }
-
-    /**
-     * 编辑数据
-     *
-     * @param orderFieldLockApplyVO 数据VO
-     * @return 编辑结果
-     */
-    @PostMapping("/edit")
-    @AnonymousAccess
-    public ServerResult edit(@RequestBody OrderFieldLockApplyVO orderFieldLockApplyVO) {
-        return orderFieldLockApplyService.edit(orderFieldLockApplyVO);
-    }
-
-    /**
-     * 删除数据
-     *
-     * @param orderFieldLockApplyQueryVO 查询条件
-     * @return 删除是否成功
-     */
-    @PostMapping("/delete_by_id")
-    @AnonymousAccess
-    public ServerResult deleteById(@RequestBody OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO) {
-        return orderFieldLockApplyService.deleteById(orderFieldLockApplyQueryVO);
-    }
-
 }
 package com.order.erp.controller;
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -9,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author makejava
  * @since 2023-09-08 15:26:46
  */
+@Api(tags = "（忽略）")
 @RestController
 @RequestMapping("/gwms/xxx")
 public class OrderOptLogController {
@@ -5,6 +5,8 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.vo.SysLogQueryVO;
 import com.order.erp.domain.vo.SysLogVO;
 import com.order.erp.service.SysLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +21,7 @@ import javax.annotation.Resource;
  * @author makejava
  * @since 2023-09-06 16:24:52
  */
+@Api(tags = "系统日志")
 @RestController
 @RequestMapping("/order/erp/logs")
 public class SysLogController {
@@ -36,57 +39,10 @@ public class SysLogController {
      */
     @PostMapping("/list")
     @AnonymousAccess
+    @ApiOperation("分页查询")
     public ServerResult list(@RequestBody @Validated SysLogQueryVO sysLogQueryVO) {
         return sysLogService.list(sysLogQueryVO);
     }
-    /**
-     * 通过主键查询单条数据
-     *
-     * @param sysLogQueryVO 查询条件
-     * @return 单条数据
-     */
-    @PostMapping("/query_by_id")
-    @AnonymousAccess
-    public ServerResult queryById(@RequestBody SysLogQueryVO sysLogQueryVO) {
-        return sysLogService.queryById(sysLogQueryVO);
-    }
-
-    /**
-     * 新增数据
-     *
-     * @param sysLogVO 数据VO
-     * @return 新增结果
-     */
-    @PostMapping("/add")
-    @AnonymousAccess
-    public ServerResult add(@RequestBody SysLogVO sysLogVO) {
-        return sysLogService.add(sysLogVO);
-    }
-
-    /**
-     * 编辑数据
-     *
-     * @param sysLogVO 数据VO
-     * @return 编辑结果
-     */
-    @PostMapping("/edit")
-    @AnonymousAccess
-    public ServerResult edit(@RequestBody SysLogVO sysLogVO) {
-        return sysLogService.edit(sysLogVO);
-    }
-
-    /**
-     * 删除数据
-     *
-     * @param sysLogQueryVO 查询条件
-     * @return 删除是否成功
-     */
-    @PostMapping("/delete_by_id")
-    @AnonymousAccess
-    public ServerResult deleteById(@RequestBody SysLogQueryVO sysLogQueryVO) {
-        return sysLogService.deleteById(sysLogQueryVO);
-    }
-
 }
@@ -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