From cf5af4d63002a3d301cd080dc2632ecb12a8d6c9 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Fri, 19 Jan 2024 15:16:07 +0800 Subject: [PATCH] fix bug --- .../web/controller/app/LoginController.java | 14 ++++++++ .../controller/app/TbUserAppController.java | 2 +- .../app/TbUserSingleAppController.java | 16 +++++++++ .../com/ruoyi/web/service/LoginService.java | 2 ++ .../web/service/impl/LoginServiceImpl.java | 19 ++++++++++ .../com/ruoyi/system/domain/TbUserSingle.java | 36 +++++++++++++++++++ .../mapper/system/TbUserSingleMapper.xml | 16 +++++++-- 7 files changed, 102 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java index 83638d76..5cb5b75f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/LoginController.java @@ -37,6 +37,20 @@ public class LoginController { } + //密码登陆 + @ResponseBody + @PostMapping(value = "/updatePasswordByPhone") + @ApiOperation(value = "验证码找回密码", response = LoginReq.class) + public Result updatePasswordByPhone(@RequestBody @NotNull LoginReq loginReq){ + try { + loginService.updatePasswordByPhone(loginReq); + return Result.success(); + }catch (Exception e){ + return Result.error(e.getMessage()); + } + + } + // 手机号验证码登陆 @ResponseBody @PostMapping(value = "/loginByPassword") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java index 78ce6917..e0fb27a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java @@ -50,7 +50,7 @@ public class TbUserAppController { @Transactional(rollbackFor = Exception.class) public Result drawData() { - for (int i = 1; i< 40; i++){ + for (int i = 101; i< 150; i++){ try { Thread.sleep(3000L); log.info("请求的url路径:{}", SZ_URL_PREFIX + i); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java index 3f6fff14..eac9788f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java @@ -21,6 +21,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Calendar; +import java.util.Date; import java.util.List; /** @@ -95,6 +97,20 @@ public class TbUserSingleAppController { @RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) { PageHelper.startPage(pageNum, pageSize); + // 18 + if(tbUserSingle.getAgeStart() != null){ + Calendar calendar = DateUtil.calendar(new Date()); + calendar.add(Calendar.YEAR, -1 * tbUserSingle.getAgeStart()); + // 2006 + tbUserSingle.setBirthdayEnd(calendar.getTime()); + } + // 30 + if(tbUserSingle.getAgeEnd() != null){ + Calendar calendar = DateUtil.calendar(new Date()); + calendar.add(Calendar.YEAR, -1 * tbUserSingle.getAgeEnd()); + // 1994 + tbUserSingle.setBirthdayStart(calendar.getTime()); + } List list = tbUserSingleService.selectTbUserSingleList(tbUserSingle); list.forEach(model->{ if(model.getBirthday() != null){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/LoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/LoginService.java index 49847f0f..196154d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/LoginService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/LoginService.java @@ -9,4 +9,6 @@ public interface LoginService { LoginResp loginByPassword(LoginReq loginReq) throws Exception; + void updatePasswordByPhone(LoginReq loginReq) throws Exception; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/LoginServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/LoginServiceImpl.java index 60db3333..f65d4cc8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/LoginServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/impl/LoginServiceImpl.java @@ -82,6 +82,25 @@ public class LoginServiceImpl implements LoginService { return resp; } + @Override + public void updatePasswordByPhone(LoginReq loginReq) throws Exception { + String alreadyCode = stringRedisTemplate.opsForValue().get(RedisConstants.SMS_CODE_PREFIX+loginReq.getMobile()); + if(StringUtils.isEmpty(alreadyCode)){ + throw new Exception("验证码已过期!"); + } + if(!alreadyCode.equals(loginReq.getAuthCode())){ + throw new Exception("短信验证码错误!"); + } + TbUser tbUser = tbUserService.lambdaQuery().eq(TbUser::getMobile, loginReq.getMobile()).one(); + //如果用户-- 则注册新用户,只带入用户的手机号+默认密码123456 + if(tbUser != null){ + if(StringUtils.isNotEmpty(loginReq.getPassword())){ + tbUser.setPassword(DigestUtils.md5Hex(loginReq.getPassword())); + } + tbUserService.updateById(tbUser); + } + } + @Override public LoginResp loginByPassword(LoginReq loginReq) throws Exception{ LoginResp resp = new LoginResp(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java index 7128d7b1..e36e2ef2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java @@ -64,11 +64,35 @@ public class TbUserSingle extends BaseEntity @ApiModelProperty(value = "年龄") private Integer age; + @TableField(exist = false) + @ApiModelProperty(value = "年龄-最小") + private Integer ageStart; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Date birthdayStart; + + @TableField(exist = false) + @ApiModelProperty(value = "年龄-最大") + private Integer ageEnd; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Date birthdayEnd; + /** 身高(单位cm) */ @Excel(name = "身高(单位cm)") @ApiModelProperty(value = "身高(单位cm)") private Long height; + @TableField(exist = false) + @ApiModelProperty(value = "身高-最小") + private Long heightStart; + + @TableField(exist = false) + @ApiModelProperty(value = "身高-最大") + private Long heightEnd; + /** 体重(单位KG) */ @Excel(name = "体重(单位KG)") @ApiModelProperty(value = "体重(单位KG)") @@ -99,11 +123,23 @@ public class TbUserSingle extends BaseEntity @ApiModelProperty(value = "收入(元/年)") private Long income; + @TableField(exist = false) + @ApiModelProperty(value = "收入-最小") + private Long incomeStart; + + @TableField(exist = false) + @ApiModelProperty(value = "收入-最大") + private Long incomeEnd; + /** 籍贯 */ @Excel(name = "籍贯") @ApiModelProperty(value = "籍贯") private String nativePlace; + @Excel(name = "工作地") + @ApiModelProperty(value = "工作地") + private String workPlace; + /** 省份 */ @Excel(name = "省份") @ApiModelProperty(value = "省份") diff --git a/ruoyi-system/src/main/resources/mapper/system/TbUserSingleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbUserSingleMapper.xml index 6e4530ac..3a4b93f8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TbUserSingleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TbUserSingleMapper.xml @@ -20,6 +20,7 @@ + @@ -34,7 +35,7 @@ - select id, user_id, nick_name, real_name, sex, status, birthday, height, weight, education, school, marriage, job, income, native_place, province_id, city_id, house_property, car_property, self_introduce, family_background, hobby, choosing_standard, create_time, update_time, remark from tb_user_single + select id, user_id, nick_name, real_name, sex, status, birthday, height, weight, education, school, marriage, job, income, native_place, work_place, province_id, city_id, house_property, car_property, self_introduce, family_background, hobby, choosing_standard, create_time, update_time, remark from tb_user_single