From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 159 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 114 insertions(+), 45 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..f346771 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,9 +30,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.regex.Pattern;
/**
@@ -92,15 +92,16 @@
* @param worker 登录信息
* @return token
*/
- private HashMap<String, Object> generateLoginToken(MasterWorker worker) {
+ private Map<String, Object> generateLoginToken(MasterWorker worker) {
// 校验通过，生成token及过期时间
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setName(worker.getRealName());
loginUserInfo.setUserid(worker.getId());
loginUserInfo.setPhone(worker.getPhone());
loginUserInfo.setLoginTime(System.currentTimeMillis());
- HashMap<String, Object> map = new HashMap<>(8);
+ Map<String, Object> map = new HashMap<>(8);
map.put("token", tokenService.createTokenByWorker(loginUserInfo));
+ map.put("userId", worker.getId());
return map;
}
@@ -113,15 +114,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 +129,25 @@
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("当前手机号未注册！");
+ // 校验师傅是否已提交入驻申请
+ WorkerProcess process = workerProcessService.lambdaQuery()
+ .eq(WorkerProcess::getPhone, phone)
+ .eq(WorkerProcess::getIsDelete, 0).one();
+ if (Constants.ZERO.equals(process.getState())) {
+ return R.fail("入驻申请暂未审核通过，请耐心等待！");
+ } else if (Constants.TWO.equals(process.getState())) {
+ return R.fail("入驻申请已驳回，请重新提交入驻申请！");
+ } else {
+ return R.registered("当前账号未提交入驻申请，无法登录！");
+ }
}
// 校验通过，生成token及过期时间
return R.ok(generateLoginToken(worker));
@@ -146,9 +160,9 @@
*/
@ApiOperation(value = "入驻申请", tags = {"师傅端-登录"})
@PostMapping(value = "/settledApply")
- public R<String> settledApply(@RequestBody WorkerProcess workerProcess) {
+ public R<String> settledApply(@RequestBody @Validated WorkerProcess workerProcess) {
String phone = workerProcess.getPhone();
- String phoneCode = workerProcess.getPhoneCode();
+ String phoneCode = workerProcess.getCode();
Object redisCodeObj = redisService.getCacheObject(RedisConstants.WORKER_SETTLE_KEY + phone);
if (null == redisCodeObj) {
return R.errorCode("验证码错误或已过期！");
@@ -164,27 +178,33 @@
return R.registered("当前手机号已注册！");
}
// 校验手机号是否已提交申请
- WorkerProcess dbProcess = workerProcessService.lambdaQuery().eq(WorkerProcess::getPhone, phone)
+ WorkerProcess dbProcess = workerProcessService.lambdaQuery()
+ .eq(WorkerProcess::getPhone, phone)
.eq(WorkerProcess::getIsDelete, 0).one();
if (null != dbProcess) {
- return R.repeatedSubmission("当前手机号已提交申请，请勿重复提交！");
- }
- // 默认状态待审核
- workerProcess.setState(Constants.ZERO);
- // 获取用户性别
- String idNumber = workerProcess.getIdNumber();
- // 判断身份证号码长度是否合法
- if (idNumber.length() == Constants.EIGHTEEN) {
- // 获取身份证号码倒数第二位的数字
- int genderNum = Integer.parseInt(idNumber.substring(16, 17));
- // 判断性别
- if (genderNum % Constants.TWO == 0) {
- workerProcess.setSex("女");
- } else {
- workerProcess.setSex("男");
+ if (Constants.ZERO.equals(dbProcess.getState())) {
+ return R.fail("入驻申请已提交，审核未通过，请耐心等待！");
+ } else if (Constants.ONE.equals(dbProcess.getState())) {
+ return R.fail("该手机号入驻申请已通过，请通过手机号登录！");
}
} else {
- return R.idNumberIllegal("身份证号码不合法！");
+ // 默认状态待审核
+ workerProcess.setState(Constants.ZERO);
+ // 获取用户性别
+ String idNumber = workerProcess.getIdNumber();
+ // 判断身份证号码长度是否合法
+ if (idNumber.length() == Constants.EIGHTEEN) {
+ // 获取身份证号码倒数第二位的数字
+ int genderNum = Integer.parseInt(idNumber.substring(16, 17));
+ // 判断性别
+ if (genderNum % Constants.TWO == 0) {
+ workerProcess.setSex("女");
+ } else {
+ workerProcess.setSex("男");
+ }
+ } else {
+ return R.idNumberIllegal("身份证号码不合法！");
+ }
}
return workerProcessService.save(workerProcess) ? R.ok("申请成功！") : R.fail("申请失败！");
}
@@ -207,7 +227,7 @@
if (null == redisCode) {
return R.errorCode("验证码错误或已过期！");
}
- String redisCodeStr = String.valueOf(redisCode).split(",")[0];
+ String redisCodeStr = String.valueOf(redisCode).split(":")[0];
if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
return R.errorCode("验证码错误或已过期！");
}
@@ -234,7 +254,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 +297,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 +316,32 @@
return R.loginExpire("登录已失效！");
}
return R.ok(masterWorkerService.orderNotHandle(loginWorker.getUserid(), longitude, latitude));
+ }
+
+ /**
+ * 师傅端-操作指南
+ */
+ @ApiOperation(value = "操作指南", tags = {"师傅端-首页"})
+ @GetMapping(value = "/guide")
+ public R<Agreement> guide() {
+ LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
+ if (null == loginWorker) {
+ return R.loginExpire("登录已失效！");
+ }
+ return R.ok(adminClient.dataInfo(Constants.TWO).getData());
+ }
+
+ /**
+ * 师傅端-订单代办列表
+ */
+ @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 +373,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 +438,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 +459,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