From 02e99e878911715d2785e371ae6fb576597578b0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 09 八月 2024 09:34:49 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 96 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 24 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 7b425ce..2edf241 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
@@ -72,12 +72,30 @@
public R<Object> passwordLogin(@RequestBody @Validated LoginPasswordRequest loginPasswordRequest) {
String phone = loginPasswordRequest.getPhone();
String password = loginPasswordRequest.getPassword();
- MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone).eq(MasterWorker::getIsDelete, 0).one();
- if (null == worker) {
- return R.unregistered("当前手机号未注册！");
- }
- if (!Constants.ONE.equals(worker.getIsEnable())) {
- return R.notEnabled("当前手机号已禁用！");
+ 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 {
+ // 校验师傅是否已提交入驻申请
+ WorkerProcess process = workerProcessService.lambdaQuery()
+ .eq(WorkerProcess::getPhone, phone)
+ .eq(WorkerProcess::getIsDelete, 0)
+ .orderByDesc(WorkerProcess::getCreateTime)
+ .last("limit 1").one();
+ if (null != process) {
+ if (Constants.ZERO.equals(process.getState())) {
+ return R.fail("入驻申请暂未审核通过，请耐心等待！");
+ } else if (Constants.TWO.equals(process.getState())) {
+ return R.fail("当前手机号未注册！");
+ } else {
+ return R.registered("当前账号未提交入驻申请，无法登录！");
+ }
+ } else {
+ return R.registered("当前账号未提交入驻申请，无法登录！");
+ }
}
// MD5加密登录密码(新)
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@@ -96,6 +114,22 @@
* @return token
*/
private Map<String, Object> generateLoginToken(MasterWorker worker) {
+ // 通知其他师傅下线
+// Integer workerId = worker.getId();
+// Set redisCache = redisService.getKeysPrefix(CacheConstants.LOGIN_WORKER_TOKEN_KEY);
+// for (Object key : redisCache) {
+// String strKey = String.valueOf(key);
+// // 根据 login_tokens:加密token 获取用户登录信息
+// Object redisCacheUserInfo = redisService.getCacheObject(strKey);
+// LoginUserInfo redisUserInfo = JSONObject.parseObject(JSONObject.toJSONString(redisCacheUserInfo), LoginUserInfo.class);
+// // 单点逻辑，如果当前用户已处于登录状态并再次登录，则清除该用户上一次登录token
+// if (workerId.equals(redisUserInfo.getUserid())) {
+// ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(workerId));
+// if (null != context) {
+// NettyWebSocketController.sendMsgToClient(context, "当前登录账号在其他设备登录！");
+// }
+// }
+// }
// 校验通过，生成token及过期时间
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setName(worker.getRealName());
@@ -123,13 +157,13 @@
// 手机验证码校验获取缓存验证码
Object phoneCodeRedis = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
if (null == phoneCodeRedis) {
- return R.errorCode("登录失败，验证码已过期!");
+ return R.errorCode("验证码错误!");
} else {
// redis 验证码的value 为 code:时间戳
String rCodeAndTime = String.valueOf(phoneCodeRedis);
String rCode = rCodeAndTime.split(":")[0];
if (!rCode.equalsIgnoreCase(phoneCode)) {
- return R.errorCode("登录失败，验证码无效!");
+ return R.errorCode("验证码错误!");
}
}
}
@@ -143,12 +177,13 @@
// 校验师傅是否已提交入驻申请
WorkerProcess process = workerProcessService.lambdaQuery()
.eq(WorkerProcess::getPhone, phone)
- .eq(WorkerProcess::getIsDelete, 0).one();
+ .eq(WorkerProcess::getIsDelete, 0)
+ .orderByDesc(WorkerProcess::getCreateTime)
+ .last("limit 1").one();
if (null != process) {
if (Constants.ZERO.equals(process.getState())) {
return R.fail("入驻申请暂未审核通过，请耐心等待！");
} else if (Constants.TWO.equals(process.getState())) {
-// return R.fail("入驻申请已驳回，请重新提交入驻申请！");
return R.fail("当前手机号未注册！");
} else {
return R.registered("当前账号未提交入驻申请，无法登录！");
@@ -173,11 +208,11 @@
String phoneCode = workerProcess.getCode();
Object redisCodeObj = redisService.getCacheObject(RedisConstants.WORKER_SETTLE_KEY + phone);
if (null == redisCodeObj) {
- return R.errorCode("验证码错误或已过期！");
+ return R.errorCode("验证码错误！");
}
String redisCodeStr = String.valueOf(redisCodeObj).split(":")[0];
if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
- return R.errorCode("验证码错误或已过期！");
+ return R.errorCode("验证码错误！");
}
// 校验手机号是否已注册
MasterWorker masterWorker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
@@ -193,8 +228,6 @@
if (null != dbProcess) {
if (Constants.ZERO.equals(dbProcess.getState())) {
return R.fail("入驻申请已提交，审核未通过，请耐心等待！");
- } else if (Constants.ONE.equals(dbProcess.getState())) {
- return R.fail("该手机号入驻申请已通过，请通过手机号登录！");
}
}
// 默认状态待审核
@@ -233,11 +266,11 @@
// 验证码是否一致
Object redisCode = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
if (null == redisCode) {
- return R.errorCode("验证码错误或已过期！");
+ return R.errorCode("验证码错误！");
}
String redisCodeStr = String.valueOf(redisCode).split(":")[0];
if (!String.valueOf(redisCodeStr).equalsIgnoreCase(phoneCode)) {
- return R.errorCode("验证码错误或已过期！");
+ return R.errorCode("验证码错误！");
}
// 手机号是否注册
MasterWorker worker = masterWorkerService.lambdaQuery()
@@ -305,9 +338,11 @@
// 订单统计
WorkerOrderCountVO orderCount = orderClient.orderStateCount(masterWorker.getId()).getData();
// 操作指导详情
- Agreement agreement = adminClient.dataInfo(Constants.TWO).getData();
- return R.ok(new HomePageInfoVO(masterWorker, orderCount,
- null == agreement ? null : agreement.getContent()));
+ Agreement agreement = adminClient.operate().getData();
+ if (null == agreement) {
+ return R.fail(adminClient.operate().getMsg());
+ }
+ return R.ok(new HomePageInfoVO(masterWorker, orderCount, agreement.getContent()));
}
/**
@@ -327,10 +362,18 @@
return R.ok(masterWorkerService.orderNotHandle(loginWorker.getUserid(), longitude, latitude));
}
+ @ApiOperation(value = "下拉框", tags = {"后台-下拉框"})
+ @GetMapping(value = "/workSelect")
+ public R<List<MasterWorker>> workSelect() {
+
+ List<MasterWorker> list = masterWorkerService.lambdaQuery().eq(MasterWorker::getIsEnable, 1).eq(MasterWorker::getIsDelete, 0).list();
+ return R.ok(list);
+ }
+
/**
- * 师傅端-订单代办列表
+ * 师傅端-订单列表-地图模式
*/
- @ApiOperation(value = "订单代办列表", tags = {"师傅端-首页"})
+ @ApiOperation(value = "订单列表-地图模式", tags = {"师傅端-首页"})
@GetMapping(value = "/orderMapMode")
@ApiImplicitParams({
@ApiImplicitParam(value = "师傅所在经度", name = "longitude", dataType = "String", required = true),
@@ -354,7 +397,12 @@
if (null == loginWorker) {
return R.loginExpire("登录已失效！");
}
- return R.ok(adminClient.dataInfo(Constants.TWO).getData());
+ // 操作指导详情
+ Agreement agreement = adminClient.operate().getData();
+ if (null == agreement) {
+ return R.fail(adminClient.operate().getMsg());
+ }
+ return R.ok(agreement);
}
/**
@@ -489,11 +537,11 @@
// 验证码是否一致
Object redisCode = redisService.getCacheObject(RedisConstants.WORKER_APPLY_KEY + phone);
if (null == redisCode) {
- return R.errorCode("验证码错误或已过期！");
+ return R.errorCode("验证码错误！");
}
String redisCodeStr = String.valueOf(redisCode).split(":")[0];
if (!String.valueOf(redisCodeStr).equalsIgnoreCase(code)) {
- return R.errorCode("验证码错误或已过期！");
+ return R.errorCode("验证码错误！");
}
}
LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
--
Gitblit v1.7.1