diff --git a/yudao-module-map/yudao-module-map-api/src/main/java/cn/iocoder/yudao/module/map/enums/ErrorCodeConstants.java b/yudao-module-map/yudao-module-map-api/src/main/java/cn/iocoder/yudao/module/map/enums/ErrorCodeConstants.java index fe4ecfb6de..31550e8da3 100644 --- a/yudao-module-map/yudao-module-map-api/src/main/java/cn/iocoder/yudao/module/map/enums/ErrorCodeConstants.java +++ b/yudao-module-map/yudao-module-map-api/src/main/java/cn/iocoder/yudao/module/map/enums/ErrorCodeConstants.java @@ -4,7 +4,19 @@ public interface ErrorCodeConstants { // ========== 高德关键字搜索记录 1-050-000-000 ========== // ========== 高德关键字搜索记录 TODO 补充编号 ========== - ErrorCode KEYWORD_SEARCH_NOT_EXISTS = new ErrorCode(1_050_001_000, "搜索记录不存在"); - ErrorCode POIS_NOT_EXISTS = new ErrorCode(1_050_002_000, "高德POI基础信息不存在"); + ErrorCode POIS_DATA_REQUEST = new ErrorCode(1_050_001_000, "POI信息获取"); + ErrorCode POIS_KEYS_EXISTS = new ErrorCode(1_050_001_001, "高德Key不存在"); + ErrorCode KEYWORD_SEARCH_NOT_EXISTS = new ErrorCode(1_050_001_001, "搜索记录不存在"); + + ErrorCode POIS_NOT_EXISTS = new ErrorCode(1_050_002_001, "高德POI基础信息不存在"); + + ErrorCode POI_TYPES_NOT_EXISTS = new ErrorCode(1_050_003_001, "POI类型不存在"); + + ErrorCode POI_REQUEST_SUCCESS = new ErrorCode(1_050_001_002, "POI 请求失败"); + + ErrorCode POI_REQUEST_ERROR = new ErrorCode(1_050_001_003, "POI 请求失败"); + + ErrorCode POI_REQUEST_NO_MEMBER = new ErrorCode(1_050_001_004, "未能获取到登录用户"); + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java index 6a642bbf0f..8f2335bead 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.member.controller.admin.user.vo.*; +import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO; import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert; import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; @@ -19,6 +20,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.annotation.security.PermitAll; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -110,4 +112,17 @@ public class MemberUserController { return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups)); } + + @PutMapping("/reset-default-password") + @Operation(summary = "重置默认密码", description = "仅限管理员使用的重置密码") + @PreAuthorize("@ss.hasPermission('member:user:reset-def-password')") + public CommonResult resetDefPassword(@RequestBody @Valid MemberUserPasswordReqVO reqVO) { + reqVO.setPassword("admin123456"); + memberUserService.resetDefPassword(reqVO); + return success(true); + } + + + + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPasswordReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPasswordReqVO.java new file mode 100644 index 0000000000..107f851e3d --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPasswordReqVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.member.controller.admin.user.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +@Schema(description = "管理后台 - 会员重置密码 Request VO") +@Data +public class MemberUserPasswordReqVO { + @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @NotNull(message = "用户编号不能为空") + private Long id; + + @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456") + @Length(min = 4, max = 16, message = "密码长度为 4-16 位") + private String password; +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java index f956a50591..0cf9aa0bbb 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.TerminalEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.validation.Mobile; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPasswordReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; import cn.iocoder.yudao.module.member.controller.app.user.vo.*; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; @@ -197,4 +198,10 @@ public interface MemberUserService { */ boolean updateUserPoint(Long userId, Integer point); + /** + * 重置用户的默认密码 + * + * @param reqVO 请求信息 + */ + void resetDefPassword(MemberUserPasswordReqVO reqVO); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index 7e51c89d3e..9a8756cac3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO; +import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPasswordReqVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; import cn.iocoder.yudao.module.member.controller.app.user.vo.*; import cn.iocoder.yudao.module.member.convert.auth.AuthConvert; @@ -374,4 +375,16 @@ public class MemberUserServiceImpl implements MemberUserService { return true; } + + @Override + public void resetDefPassword(MemberUserPasswordReqVO reqVO) { + //根据ID重置密码 + MemberUserDO user = memberUserMapper.selectById(reqVO.getId()); + if (user != null) { + // 重置密码 + memberUserMapper.updateById(MemberUserDO.builder().id(reqVO.getId()) + .password(passwordEncoder.encode(reqVO.getPassword())).build()); + } + } + }