Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiS...

xuhy

2025-04-22 4b2c48677c2b5de7f89ff0d018a55b7916467b27

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

@@ -36,12 +36,7 @@
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;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -74,9 +69,10 @@

    @PostMapping("/version/check")
    @ApiOperation(value = "获取最新的版本信息", tags = {"自动更新"})
    public R<AppVersion> check() {
    public R check() {
        AppVersion appVersion = appMapper.selectOne(new QueryWrapper<AppVersion>().orderByDesc("createTime").eq("is_delete", 0).last("limit 1"));
            return R.ok(appVersion);
//         Object version = redisService.getCacheObject("version");
        return R.ok(appVersion);
    }
    /**
     * 师傅端-密码登录
@@ -119,6 +115,42 @@
        boolean matches = passwordEncoder.matches(password, worker.getPassword());
        if (!matches) {
            return R.passwordError("登录密码错误！");
        }
        return R.ok(generateLoginToken(worker));
    }
    /**
     * 师傅端-密码登录
     *
     * @param loginPasswordRequest 手机号及密码信息
     */
    @ApiOperation(value = "2.0新增登录师傅切换", tags = {"2.0新增登录师傅切换"})
    @PostMapping(value = "/loginApp")
    public R<Object> loginApp(@RequestBody  LoginPasswordRequest loginPasswordRequest) {
        String phone = loginPasswordRequest.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("登录失败，当前账号未启用!");
            }
        } 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("当前账号未提交入驻申请，无法登录！");
            }
        }
        return R.ok(generateLoginToken(worker));
    }
@@ -371,6 +403,7 @@
            @ApiImplicitParam(value = "师傅所在纬度", name = "latitude", dataType = "String", required = true)
    })
    public R<List<OrderListVO>> orderNotHandle(@RequestParam String longitude, @RequestParam String latitude) {

        LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
        if (null == loginWorker) {
            return R.loginExpire("登录已失效！");
@@ -574,4 +607,39 @@
        return update ? R.ok("修改成功！") : R.fail("修改失败！");
    }

    /**
     * 师傅端-修改性别
     */
//    @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})
//    @GetMapping(value = "/updateLonLat")
//    @ApiImplicitParams({
//            @ApiImplicitParam(value = "经度", name = "workerLon", dataType = "String", required = true),
//            @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),
//    })
//    public R<String> updateLonLat(@RequestParam("workerLon") String workerLon, @RequestParam("workerLat") String workerLat) {
//        LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
//        if (null == loginWorker) {
//            return R.loginExpire("登录已失效！");
//        }
//        boolean update = masterWorkerService.lambdaUpdate()
//                .set(MasterWorker::getWorkerLon, workerLon)
//                .set(MasterWorker::getWorkerLat, workerLat)
//                .eq(MasterWorker::getId, loginWorker.getUserid())
//                .eq(MasterWorker::getIsDelete, 0).update();
//        return update ? R.ok("修改成功！") : R.fail("修改失败！");
//    }

    /**
     * 师傅端-打电话
     */
    @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
    @GetMapping(value = "/workerCall")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
    })
    public R<String> workerCall(@RequestParam String orderId) {
        orderClient.call(orderId);
        return R.ok();
    }

}