二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
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>


@@ -615,23 +610,36 @@


    /**


     * 师傅端-修改性别


     */


    @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})


    @GetMapping(value = "/updateLonLat")


//    @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 = "经度", name = "workerLon", dataType = "String", required = true),


            @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),


            @ApiImplicitParam(value = "订单id", name = "orderId", 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("修改失败！");


    public R<String> workerCall(@RequestParam String orderId) {


        orderClient.call(orderId);


        return R.ok();


    }




}