新增优化

mitao

2024-09-04 ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb

 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java

@@ -1,6 +1,7 @@
package com.ruoyi.worker.controller;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.admin.api.entity.Agreement;
import com.ruoyi.admin.api.feignClient.AdminClient;
import com.ruoyi.common.core.constant.Constants;
@@ -13,8 +14,10 @@
import com.ruoyi.order.api.entity.WorkerOrderCountVO;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.worker.entity.AppVersion;
import com.ruoyi.worker.entity.MasterWorker;
import com.ruoyi.worker.entity.WorkerProcess;
import com.ruoyi.worker.mapper.AppMapper;
import com.ruoyi.worker.request.LoginPasswordRequest;
import com.ruoyi.worker.request.LoginPhoneRequest;
import com.ruoyi.worker.service.MasterWorkerService;
@@ -25,16 +28,20 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
@@ -61,7 +68,16 @@
    private AdminClient adminClient;
    @Resource
    private OrderClient orderClient;
    @Resource
    private AppMapper appMapper;


    @PostMapping("/version/check")
    @ApiOperation(value = "获取最新的版本信息", tags = {"自动更新"})
    public R<AppVersion> check() {
        AppVersion appVersion = appMapper.selectOne(new QueryWrapper<AppVersion>().orderByDesc("createTime").eq("is_delete", 0).last("limit 1"));
            return R.ok(appVersion);
    }
    /**
     * 师傅端-密码登录
     *
@@ -72,25 +88,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("当前手机号已禁用！");
        }
        // 校验师傅是否已提交入驻申请
        WorkerProcess process = workerProcessService.lambdaQuery()
                .eq(WorkerProcess::getPhone, phone)
                .eq(WorkerProcess::getIsDelete, 0)
                .orderByDesc(WorkerProcess::getCreateTime)
                .last("limit 1").one();
        if (null != process) {
            if (Constants.TWO.equals(process.getState())) {
                return R.fail("入驻申请暂未审核通过，请耐心等待！");
        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.registered("当前账号未提交入驻申请，无法登录！");
            // 校验师傅是否已提交入驻申请
            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();
@@ -109,6 +130,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());
@@ -136,13 +173,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("验证码错误!");
                }
            }
        }
@@ -163,7 +200,6 @@
                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("当前账号未提交入驻申请，无法登录！");
@@ -188,11 +224,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)
@@ -246,11 +282,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()
@@ -318,9 +354,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()));
    }

    /**
@@ -338,6 +376,14 @@
            return R.loginExpire("登录已失效！");
        }
        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);
    }

    /**
@@ -367,7 +413,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);
    }

    /**
@@ -502,11 +553,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();