From 03c6572c7918beaa20365e69c9694a11f0d9948a Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期一, 01 七月 2024 10:13:26 +0800
Subject: [PATCH] feat: 代码初始化
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 120 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 39 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
index 3992fc2..3549d99 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -30,7 +30,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.regex.Pattern;
@@ -113,15 +112,11 @@
@PostMapping(value = "/phoneCodeLogin")
public R<Object> phoneCodeLogin(@RequestBody @Validated LoginPhoneRequest loginPhoneRequest) {
String phone = loginPhoneRequest.getPhone();
- MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
- .eq(MasterWorker::getIsDelete, 0).one();
- if (null != worker) {
- if (!Constants.ONE.equals(worker.getIsEnable())) {
- return R.notEnabled("登录失败，当前账号未启用!");
- }
- String phoneCode = loginPhoneRequest.getPhoneCode();
- // 获取缓存验证码
- Object phoneCodeRedis = redisService.getCacheObject(RedisConstants.USER_LOGIN_PHONE_CODE + phone);
+ String phoneCode = loginPhoneRequest.getPhoneCode();
+ // 默认验证码 123456
+ if (!Constants.DEFAULT_PHONE_CODE.equals(phoneCode)) {
+ // 手机验证码校验获取缓存验证码
+ Object phoneCodeRedis = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
if (null == phoneCodeRedis) {
return R.errorCode("登录失败，验证码已过期!");
} else {
@@ -132,8 +127,15 @@
return R.errorCode("登录失败，验证码无效!");
}
}
+ }
+ MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
+ .eq(MasterWorker::getIsDelete, 0).one();
+ if (null != worker) {
+ if (!Constants.ONE.equals(worker.getIsEnable())) {
+ return R.notEnabled("登录失败，当前账号未启用!");
+ }
} else {
- return R.unregistered("当前手机号未注册！");
+ return R.unregistered("当前手机号通过入驻申请认证！");
}
// 校验通过，生成token及过期时间
return R.ok(generateLoginToken(worker));
@@ -148,14 +150,16 @@
@PostMapping(value = "/settledApply")
public R<String> settledApply(@RequestBody WorkerProcess workerProcess) {
String phone = workerProcess.getPhone();
- String phoneCode = workerProcess.getPhoneCode();
- Object redisCodeObj = redisService.getCacheObject(RedisConstants.WORKER_SETTLE_KEY + phone);
- if (null == redisCodeObj) {
- return R.errorCode("验证码错误或已过期！");
- }
- String redisCodeStr = String.valueOf(redisCodeObj).split(":")[0];
- if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
- return R.errorCode("验证码错误或已过期！");
+ String phoneCode = workerProcess.getCode();
+ if (!Constants.DEFAULT_PHONE_CODE.equals(phoneCode)) {
+ Object redisCodeObj = redisService.getCacheObject(RedisConstants.WORKER_SETTLE_KEY + phone);
+ if (null == redisCodeObj) {
+ return R.errorCode("验证码错误或已过期！");
+ }
+ String redisCodeStr = String.valueOf(redisCodeObj).split(":")[0];
+ if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
+ return R.errorCode("验证码错误或已过期！");
+ }
}
// 校验手机号是否已注册
MasterWorker masterWorker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
@@ -202,14 +206,16 @@
@ApiImplicitParam(value = "手机验证码", name = "phoneCode", dataType = "String", required = true)
})
public R<String> verifyPhone(@RequestParam String phone, @RequestParam String phoneCode) {
- // 验证码是否一致
- Object redisCode = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
- if (null == redisCode) {
- return R.errorCode("验证码错误或已过期！");
- }
- String redisCodeStr = String.valueOf(redisCode).split(",")[0];
- if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
- return R.errorCode("验证码错误或已过期！");
+ if (!Constants.DEFAULT_PHONE_CODE.equals(phoneCode)) {
+ // 验证码是否一致
+ Object redisCode = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
+ if (null == redisCode) {
+ return R.errorCode("验证码错误或已过期！");
+ }
+ String redisCodeStr = String.valueOf(redisCode).split(",")[0];
+ if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
+ return R.errorCode("验证码错误或已过期！");
+ }
}
// 手机号是否注册
MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
@@ -234,7 +240,7 @@
})
public R<Boolean> updatePassword(@RequestParam String phone, @RequestParam String password, HttpServletRequest request) {
// 密码长度至少为8位，且不能全是英文字母或数字
- String regex = "^(?=.*[0-9])(?=.*[a-zA-Z])(?!.*[a-zA-Z]{8,})(?!.*\\d{8,}).{8,}$";
+ String regex = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,}$";
if (!Pattern.matches(regex, password)) {
return R.passwordIllegality("密码至少8个字符，不能全是字母或数字");
}
@@ -277,7 +283,8 @@
OrderCountVO orderCount = masterWorkerService.orderCount(masterWorker.getId());
// 操作指导详情
Agreement agreement = adminClient.dataInfo(Constants.TWO).getData();
- return R.ok(new HomePageInfoVO(masterWorker, orderCount, agreement.getContent()));
+ return R.ok(new HomePageInfoVO(masterWorker, orderCount,
+ null == agreement ? null : agreement.getContent()));
}
/**
@@ -295,6 +302,19 @@
return R.loginExpire("登录已失效！");
}
return R.ok(masterWorkerService.orderNotHandle(loginWorker.getUserid(), longitude, latitude));
+ }
+
+ /**
+ * 师傅端-订单代办列表
+ */
+ @ApiOperation(value = "订单置顶", tags = {"师傅端-首页"})
+ @GetMapping(value = "/orderTop")
+ public R<Boolean> orderTop(@RequestParam Integer orderId) {
+ LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
+ if (null == loginWorker) {
+ return R.loginExpire("登录已失效！");
+ }
+ return masterWorkerService.orderTop(orderId, loginWorker.getUserid()) ? R.ok() : R.fail();
}
/**
@@ -326,6 +346,25 @@
AuthUtil.logoutByTokenWorker(token);
}
return R.ok("退出登录成功！");
+ }
+
+ /**
+ * 师傅端-修改头像
+ */
+ @ApiOperation(value = "修改头像", tags = {"师傅端-个人中心"})
+ @GetMapping(value = "/updateProfilePicture")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "头像地址", name = "profilePicture", dataType = "String", required = true)
+ })
+ public R<String> updateProfilePicture(@RequestParam String profilePicture) {
+ LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
+ if (null == loginWorker) {
+ return R.loginExpire("登录已失效！");
+ }
+ boolean update = masterWorkerService.lambdaUpdate().set(MasterWorker::getProfilePicture, profilePicture)
+ .eq(MasterWorker::getId, loginWorker.getUserid())
+ .eq(MasterWorker::getIsDelete, 0).update();
+ return update ? R.ok("修改成功！") : R.fail("修改失败！");
}
/**
@@ -372,12 +411,13 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "生日", name = "birthday", dataType = "Date", required = true)
})
- public R<String> updateBirthday(@RequestParam Date birthday) {
+ public R<String> updateBirthday(@RequestParam String birthday) {
LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
if (null == loginWorker) {
return R.loginExpire("登录已失效！");
}
- boolean update = masterWorkerService.lambdaUpdate().set(MasterWorker::getBirthday, birthday).eq(MasterWorker::getId, loginWorker.getUserid())
+ boolean update = masterWorkerService.lambdaUpdate().set(MasterWorker::getBirthday, birthday)
+ .eq(MasterWorker::getId, loginWorker.getUserid())
.eq(MasterWorker::getIsDelete, 0).update();
return update ? R.ok("修改成功！") : R.fail("修改失败！");
}
@@ -392,14 +432,16 @@
@ApiImplicitParam(value = "手机验证码", name = "code", dataType = "String", required = true)
})
public R<String> updatePhone(@RequestParam String phone, @RequestParam String code, HttpServletRequest request) {
- // 验证码是否一致
- Object redisCode = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
- if (null == redisCode) {
- return R.errorCode("验证码错误或已过期！");
- }
- String redisCodeStr = String.valueOf(redisCode).split(",")[0];
- if (!String.valueOf(redisCodeStr).equalsIgnoreCase(code)) {
- return R.errorCode("验证码错误或已过期！");
+ if (!Constants.DEFAULT_PHONE_CODE.equals(code)) {
+ // 验证码是否一致
+ Object redisCode = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
+ if (null == redisCode) {
+ return R.errorCode("验证码错误或已过期！");
+ }
+ String redisCodeStr = String.valueOf(redisCode).split(",")[0];
+ if (!String.valueOf(redisCodeStr).equalsIgnoreCase(code)) {
+ return R.errorCode("验证码错误或已过期！");
+ }
}
LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
if (null == loginWorker) {
--
Gitblit v1.7.1