Browse Source

分销商管理

lishiqiang 1 week ago
parent
commit
b19dc64da5
12 changed files with 610 additions and 6 deletions
  1. 123 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/OperatePasswordController.java
  2. 21 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordCheckAndResetReqVO.java
  3. 36 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordPageReqVO.java
  4. 39 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordRespVO.java
  5. 25 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordSaveReqVO.java
  6. 27 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordUpdateReqVO.java
  7. 46 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/dataobject/password/OperatePasswordDO.java
  8. 29 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/password/OperatePasswordMapper.java
  9. 6 5
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorServiceImpl.java
  10. 88 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/password/OperatePasswordService.java
  11. 169 0
      ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/password/OperatePasswordServiceImpl.java
  12. 1 1
      ship-server-web/src/main/resources/application.yaml

+ 123 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/OperatePasswordController.java

@@ -0,0 +1,123 @@
+package com.yc.ship.module.ota.controller.admin.password;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.pojo.PageParam;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
+import com.yc.ship.module.ota.controller.admin.password.vo.*;
+import com.yc.ship.module.ota.dal.dataobject.password.OperatePasswordDO;
+import com.yc.ship.module.ota.service.password.OperatePasswordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
+
+
+@Tag(name = "管理后台 - 操作密码")
+@RestController
+@RequestMapping("/operate-password")
+@Validated
+public class OperatePasswordController {
+
+    @Resource
+    private OperatePasswordService operatePasswordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建操作密码")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:create')")
+    public CommonResult<Long> createOperatePassword(@Valid @RequestBody OperatePasswordSaveReqVO createReqVO) {
+        return success(operatePasswordService.createOperatePassword(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新操作密码")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:update')")
+    public CommonResult<Boolean> updateOperatePassword(@Valid @RequestBody OperatePasswordSaveReqVO updateReqVO) {
+        operatePasswordService.updateOperatePassword(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除操作密码")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('support:operate-password:delete')")
+    public CommonResult<Boolean> deleteOperatePassword(@RequestParam("id") Long id) {
+        operatePasswordService.deleteOperatePassword(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得操作密码")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:query')")
+    public CommonResult<OperatePasswordRespVO> getOperatePassword(@RequestParam("id") Long id) {
+        OperatePasswordDO operatePassword = operatePasswordService.getOperatePassword(id);
+        return success(BeanUtils.toBean(operatePassword, OperatePasswordRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得操作密码分页")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:query')")
+    public CommonResult<PageResult<OperatePasswordRespVO>> getOperatePasswordPage(@Valid OperatePasswordPageReqVO pageReqVO) {
+        PageResult<OperatePasswordDO> pageResult = operatePasswordService.getOperatePasswordPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OperatePasswordRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出操作密码 Excel")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:export')")
+    @OperateLog(type = EXPORT,enable = false)
+    public void exportOperatePasswordExcel(@Valid OperatePasswordPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<OperatePasswordDO> list = operatePasswordService.getOperatePasswordPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "操作密码.xls", "数据", OperatePasswordRespVO.class,
+                        BeanUtils.toBean(list, OperatePasswordRespVO.class));
+    }
+
+    @PostMapping("/check")
+    @Operation(summary = "校验密码")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:check')")
+    public CommonResult<Boolean> checkOperatePassword(@Valid @RequestBody OperatePasswordCheckAndResetReqVO reqVO) {
+        boolean res = operatePasswordService.checkPwd(reqVO);
+        return success(res);
+    }
+
+    @PutMapping("/reset-password")
+    @Operation(summary = "重置密码")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:reset-password')")
+    public CommonResult<Boolean> resetPassword(@Valid @RequestBody OperatePasswordCheckAndResetReqVO reqVO) {
+        operatePasswordService.resetPassword(reqVO.getType(),reqVO.getPassword());
+        return success(true);
+    }
+
+    @PutMapping("/update-password")
+    @Operation(summary = "修改用户个人密码")
+    @PreAuthorize("@ss.hasPermission('support:operate-password:update-password')")
+    public CommonResult<Boolean> updatePassword(@Valid @RequestBody OperatePasswordUpdateReqVO reqVO) {
+        operatePasswordService.updatePassword( reqVO);
+        return success(true);
+    }
+
+    @GetMapping("/validateExists")
+    @Operation(summary = "校验操作密码是否存在")
+    public CommonResult<Boolean> validateExists(@RequestParam("type") Integer type) {
+        boolean result = operatePasswordService.validateExists(type);
+        return success(result);
+    }
+
+}

+ 21 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordCheckAndResetReqVO.java

@@ -0,0 +1,21 @@
+package com.yc.ship.module.ota.controller.admin.password.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 更新/重置操作密码 Request VO")
+@Data
+public class OperatePasswordCheckAndResetReqVO {
+
+    @Schema(description = "密码类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "密码类型不能为空")
+    private Integer type;
+
+    @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @NotEmpty(message = "密码不能为空")
+    private String password;
+
+}

+ 36 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordPageReqVO.java

@@ -0,0 +1,36 @@
+package com.yc.ship.module.ota.controller.admin.password.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import com.yc.ship.framework.common.pojo.PageParam;
+import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+
+@Schema(description = "管理后台 - 操作密码分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OperatePasswordPageReqVO extends PageParam {
+
+    @Schema(description = "用户ID", example = "4075")
+    private Long userId;
+
+    @Schema(description = "密码类型", example = "1")
+    private Integer type;
+
+    @Schema(description = "密码")
+    private String password;
+
+    @Schema(description = "状态0-禁用,1-启用", example = "1")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

+ 39 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordRespVO.java

@@ -0,0 +1,39 @@
+package com.yc.ship.module.ota.controller.admin.password.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 操作密码 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OperatePasswordRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5958")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "用户ID", example = "4075")
+    @ExcelProperty("用户ID")
+    private Long userId;
+
+    @Schema(description = "密码类型", example = "1")
+    @ExcelProperty("密码类型")
+    private Integer type;
+
+    @Schema(description = "密码")
+    @ExcelProperty("密码")
+    private String password;
+
+    @Schema(description = "状态0-禁用,1-启用", example = "1")
+    @ExcelProperty("状态0-禁用,1-启用")
+    private Integer status;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

+ 25 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordSaveReqVO.java

@@ -0,0 +1,25 @@
+package com.yc.ship.module.ota.controller.admin.password.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 操作密码新增/修改 Request VO")
+@Data
+public class OperatePasswordSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "5958")
+    private Long id;
+
+    @Schema(description = "用户ID", example = "4075")
+    private Long userId;
+
+    @Schema(description = "密码类型", example = "1")
+    private Integer type;
+
+    @Schema(description = "密码")
+    private String password;
+
+    @Schema(description = "状态0-禁用,1-启用", example = "1")
+    private Integer status;
+
+}

+ 27 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/password/vo/OperatePasswordUpdateReqVO.java

@@ -0,0 +1,27 @@
+package com.yc.ship.module.ota.controller.admin.password.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 更新/重置操作密码 Request VO")
+@Data
+public class OperatePasswordUpdateReqVO {
+
+    @Schema(description = "密码类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "密码类型不能为空")
+    private Integer type;
+
+    @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    @NotEmpty(message = "密码不能为空")
+    private String oldPassword;
+
+
+    @Schema(description = "新密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "654321")
+    @NotEmpty(message = "新密码不能为空")
+    private String newPassword;
+
+
+}

+ 46 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/dataobject/password/OperatePasswordDO.java

@@ -0,0 +1,46 @@
+package com.yc.ship.module.ota.dal.dataobject.password;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+/**
+ * 操作密码 DO
+ *
+ * @author 管理员
+ */
+@TableName("operate_password")
+@KeySequence("operate_password_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OperatePasswordDO extends TenantBaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 用户ID
+     */
+    private Long userId;
+    /**
+     * 密码类型
+     */
+    private Integer type;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 状态0-禁用,1-启用
+     */
+    private Integer status;
+
+}

+ 29 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/password/OperatePasswordMapper.java

@@ -0,0 +1,29 @@
+package com.yc.ship.module.ota.dal.mysql.password;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordPageReqVO;
+import com.yc.ship.module.ota.dal.dataobject.password.OperatePasswordDO;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 操作密码 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface OperatePasswordMapper extends BaseMapperX<OperatePasswordDO> {
+
+    default PageResult<OperatePasswordDO> selectPage(OperatePasswordPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OperatePasswordDO>()
+                .eqIfPresent(OperatePasswordDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(OperatePasswordDO::getType, reqVO.getType())
+                .eqIfPresent(OperatePasswordDO::getPassword, reqVO.getPassword())
+                .eqIfPresent(OperatePasswordDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(OperatePasswordDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OperatePasswordDO::getId));
+    }
+
+}

+ 6 - 5
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributor/DistributorServiceImpl.java

@@ -237,6 +237,7 @@ public class DistributorServiceImpl implements DistributorService {
             updateObj.setPassword(password);
         }
         DistributorRespVO distributorRespVO = distributorMapper.getById(updateReqVO.getId());
+        updateObj.setLoginName(distributorRespVO.getLoginName());
         updateReqVO.setTenantId(distributorRespVO.getAccountTenantId());
         //修改后台用户密码
         updateSystemUserPassword(updateReqVO);
@@ -248,9 +249,9 @@ public class DistributorServiceImpl implements DistributorService {
         // 校验存在
         validateDistributorExists(id);
         DistributorDO distributorDO = distributorMapper.selectById(id);
-//        if (distributorDO.getType() == 2) {
-//            tenantApi.deleteTenant(distributorDO.getAccountTenantId());
-//        }
+        if (distributorDO.getType() == 2) {
+            adminUserApi.deleteUser(distributorDO.getLoginName());
+        }
         // 删除
         distributorMapper.deleteById(id);
     }
@@ -302,7 +303,7 @@ public class DistributorServiceImpl implements DistributorService {
             }else if(status ==0){
                 status = 1;
             }
-//            adminUserApi.updateStatus(distributor.getLoginName(), status);
+            adminUserApi.updateStatus(distributor.getLoginName(), status);
         }
 
     }
@@ -428,7 +429,7 @@ public class DistributorServiceImpl implements DistributorService {
     }
 
     void updateSystemUserPassword(DistributorUpdatePasswordReqVO updateReqVO) {
-
+        adminUserApi.updatePwd(updateReqVO.getLoginName(),updateReqVO.getPassword());
     }
 
     @Override

+ 88 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/password/OperatePasswordService.java

@@ -0,0 +1,88 @@
+package com.yc.ship.module.ota.service.password;
+
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordCheckAndResetReqVO;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordPageReqVO;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordUpdateReqVO;
+import com.yc.ship.module.ota.dal.dataobject.password.OperatePasswordDO;
+
+import javax.validation.Valid;
+
+/**
+ * 操作密码 Service 接口
+ *
+ * @author 管理员
+ */
+public interface OperatePasswordService {
+
+    /**
+     * 创建操作密码
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOperatePassword(@Valid OperatePasswordSaveReqVO createReqVO);
+
+    /**
+     * 更新操作密码
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOperatePassword(@Valid OperatePasswordSaveReqVO updateReqVO);
+
+    /**
+     * 删除操作密码
+     *
+     * @param id 编号
+     */
+    void deleteOperatePassword(Long id);
+
+    /**
+     * 获得操作密码
+     *
+     * @param id 编号
+     * @return 操作密码
+     */
+    OperatePasswordDO getOperatePassword(Long id);
+
+    /**
+     * 获得操作密码分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 操作密码分页
+     */
+    PageResult<OperatePasswordDO> getOperatePasswordPage(OperatePasswordPageReqVO pageReqVO);
+
+    void resetPassword(Integer type, String password);
+
+    /**
+     * 判断密码是否匹配
+     *
+     * @param rawPassword 未加密的密码
+     * @param encodedPassword 加密后的密码
+     * @return 是否匹配
+     */
+    boolean isPasswordMatch(String rawPassword, String encodedPassword);
+
+    /**
+     * 校验密码是否正确
+     * @param reqVO
+     * @return
+     */
+    boolean checkPwd( OperatePasswordCheckAndResetReqVO reqVO);
+
+    /**
+     * 修改操作密码
+     * @param reqVO
+     */
+    void updatePassword(OperatePasswordUpdateReqVO reqVO);
+
+    /**
+     * 验证用户是否有该类型密码
+     * @param type
+     * @return
+     */
+    boolean validateExists(Integer type);
+}

+ 169 - 0
ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/password/OperatePasswordServiceImpl.java

@@ -0,0 +1,169 @@
+package com.yc.ship.module.ota.service.password;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordCheckAndResetReqVO;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordPageReqVO;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordSaveReqVO;
+import com.yc.ship.module.ota.controller.admin.password.vo.OperatePasswordUpdateReqVO;
+import com.yc.ship.module.ota.dal.dataobject.password.OperatePasswordDO;
+import com.yc.ship.module.ota.dal.mysql.password.OperatePasswordMapper;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+
+/**
+ * 操作密码 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class OperatePasswordServiceImpl implements OperatePasswordService {
+
+    @Resource
+    private OperatePasswordMapper operatePasswordMapper;
+    @Resource
+    private PasswordEncoder passwordEncoder;
+
+    @Override
+    public Long createOperatePassword(OperatePasswordSaveReqVO createReqVO) {
+        long loginUserId = getLoginUserId();
+        // 插入
+        OperatePasswordDO operatePassword = BeanUtils.toBean(createReqVO, OperatePasswordDO.class);
+        Long id = IdWorker.getId(operatePassword);
+        operatePassword.setId(id);
+        operatePassword.setUserId(loginUserId);
+        operatePassword.setDeleted(false);
+        operatePassword.setPassword(encodePassword(createReqVO.getPassword()));
+
+        operatePasswordMapper.insert(operatePassword);
+        // 返回
+        return operatePassword.getId();
+    }
+
+    @Override
+    public void updateOperatePassword(OperatePasswordSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOperatePasswordExists(updateReqVO.getId());
+        // 更新
+        OperatePasswordDO updateObj = BeanUtils.toBean(updateReqVO, OperatePasswordDO.class);
+        operatePasswordMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOperatePassword(Long id) {
+        // 校验存在
+        validateOperatePasswordExists(id);
+        // 删除
+        operatePasswordMapper.deleteById(id);
+    }
+
+    private void validateOperatePasswordExists(Long id) {
+        if (operatePasswordMapper.selectById(id) == null) {
+            throw exception0(11_028, "不存在");
+        }
+    }
+
+    @Override
+    public OperatePasswordDO getOperatePassword(Long id) {
+        return operatePasswordMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OperatePasswordDO> getOperatePasswordPage(OperatePasswordPageReqVO pageReqVO) {
+        return operatePasswordMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public void resetPassword(Integer type, String password) {
+        // 校验用户存在
+        long loginUserId = getLoginUserId();
+        OperatePasswordDO passwordDO = validateUserAndTypeExists(loginUserId, type);
+        if (passwordDO == null) {
+            throw exception0(11_028, "不存在");
+        }
+        try {
+            // 执行更新
+            passwordDO.setPassword(encodePassword(password)); // 加密密码
+            operatePasswordMapper.updateById(passwordDO);
+        } catch (Exception e) {
+            throw exception0(11_028, "操作失败");
+        }
+
+    }
+
+    @Override
+    public boolean validateExists(Integer type) {
+        Long userId = getLoginUserId();
+        OperatePasswordDO passwordDO = validateUserAndTypeExists(userId, type);
+        if (passwordDO == null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    @Override
+    public void updatePassword(OperatePasswordUpdateReqVO reqVO) {
+        Long userId = getLoginUserId();
+        String oldPwd = "";
+        String newPwd = "";
+        OperatePasswordDO passwordDO = validatePassword(userId, reqVO.getType(), reqVO.getOldPassword());
+        // 执行更新
+        passwordDO.setPassword(encodePassword(newPwd)); // 加密密码
+        operatePasswordMapper.updateById(passwordDO);
+    }
+
+    @Override
+    public boolean checkPwd( OperatePasswordCheckAndResetReqVO reqVO) {
+        Long userId = getLoginUserId();
+        boolean flag = true;
+        try {
+            this.validatePassword(userId, reqVO.getType(), reqVO.getPassword());
+        } catch (Exception e) {
+            flag = false;
+        }
+
+        return flag;
+    }
+
+    @Override
+    public boolean isPasswordMatch(String rawPassword, String encodedPassword) {
+        return passwordEncoder.matches(rawPassword, encodedPassword);
+    }
+
+    private OperatePasswordDO validatePassword(Long userId, Integer type, String oldPassword) {
+        OperatePasswordDO passwordDO = validateUserAndTypeExists(userId, type);
+        if (passwordDO == null) {
+            throw exception0(11_028, "不存在");
+        }
+        if (!isPasswordMatch(encodePassword(oldPassword), passwordDO.getPassword())) {
+            throw exception0(11_028, "操作失败");
+        }
+        return passwordDO;
+    }
+
+    private OperatePasswordDO validateUserAndTypeExists(Long userId, Integer type) {
+        OperatePasswordDO passwordDO = operatePasswordMapper.selectOne(OperatePasswordDO::getUserId, userId, OperatePasswordDO::getType, type);
+        return passwordDO;
+    }
+
+    /**
+     * 对密码进行加密
+     *
+     * @param password 密码
+     * @return 加密后的密码
+     */
+    private String encodePassword(String password) {
+        return passwordEncoder.encode(password);
+    }
+
+}

+ 1 - 1
ship-server-web/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: yudao-server
 
   profiles:
-    active: test
+    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。