From 29f303b64de5149c06e6afb532c0ee5d5eba0d43 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Thu, 5 Dec 2024 16:32:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driver/client/DriverInfoFeignClient.java | 5 ++++ .../controller/DriverInfoController.java | 8 ++++++ .../driver/service/DriverInfoService.java | 9 +++++++ .../service/impl/DriverInfoServiceImpl.java | 26 +++++++++++++++++++ .../driver/controller/DriverController.java | 10 +++++++ .../daijia/driver/service/DriverService.java | 9 +++++++ .../service/impl/DriverServiceImpl.java | 13 ++++++++++ 7 files changed, 80 insertions(+) diff --git a/service-client/service-driver-client/src/main/java/com/atguigu/daijia/driver/client/DriverInfoFeignClient.java b/service-client/service-driver-client/src/main/java/com/atguigu/daijia/driver/client/DriverInfoFeignClient.java index ad5b288..e03dd09 100644 --- a/service-client/service-driver-client/src/main/java/com/atguigu/daijia/driver/client/DriverInfoFeignClient.java +++ b/service-client/service-driver-client/src/main/java/com/atguigu/daijia/driver/client/DriverInfoFeignClient.java @@ -1,6 +1,7 @@ package com.atguigu.daijia.driver.client; import com.atguigu.daijia.common.result.Result; +import com.atguigu.daijia.model.vo.driver.DriverLoginVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -11,4 +12,8 @@ public interface DriverInfoFeignClient { // 小程序司机登录 @GetMapping("/driver/info/login/{code}") Result login(@PathVariable("code") String code); + + // 获取司机登录信息 + @GetMapping("/driver/info/getDriverLoginInfo/{driverId}") + Result getDriverInfo(@PathVariable Long driverId); } \ No newline at end of file diff --git a/service/service-driver/src/main/java/com/atguigu/daijia/driver/controller/DriverInfoController.java b/service/service-driver/src/main/java/com/atguigu/daijia/driver/controller/DriverInfoController.java index fd20050..fdafd2d 100644 --- a/service/service-driver/src/main/java/com/atguigu/daijia/driver/controller/DriverInfoController.java +++ b/service/service-driver/src/main/java/com/atguigu/daijia/driver/controller/DriverInfoController.java @@ -2,6 +2,7 @@ package com.atguigu.daijia.driver.controller; import com.atguigu.daijia.common.result.Result; import com.atguigu.daijia.driver.service.DriverInfoService; +import com.atguigu.daijia.model.vo.driver.DriverLoginVo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -26,5 +27,12 @@ public class DriverInfoController { Long vo = driverInfoService.login(code); return Result.ok(vo); } + + @Operation(summary = "获取司机登录信息") + @GetMapping("/getDriverLoginInfo/{driverId}") + public Result getDriverInfo(@PathVariable Long driverId) { + DriverLoginVo driverLoginVo = driverInfoService.getDriverInfo(driverId); + return Result.ok(driverLoginVo); + } } diff --git a/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/DriverInfoService.java b/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/DriverInfoService.java index f1dc30b..89d26d4 100644 --- a/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/DriverInfoService.java +++ b/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/DriverInfoService.java @@ -1,6 +1,7 @@ package com.atguigu.daijia.driver.service; import com.atguigu.daijia.model.entity.driver.DriverInfo; +import com.atguigu.daijia.model.vo.driver.DriverLoginVo; import com.baomidou.mybatisplus.extension.service.IService; public interface DriverInfoService extends IService { @@ -12,4 +13,12 @@ public interface DriverInfoService extends IService { * @return openid */ Long login(String code); + + /** + * 获取司机登录信息 + * + * @param driverId 司机id + * @return 司机信息 + */ + DriverLoginVo getDriverInfo(Long driverId); } diff --git a/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverInfoServiceImpl.java b/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverInfoServiceImpl.java index 9e27ae9..f5e4f2e 100644 --- a/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverInfoServiceImpl.java +++ b/service/service-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverInfoServiceImpl.java @@ -12,13 +12,16 @@ import com.atguigu.daijia.model.entity.driver.DriverAccount; import com.atguigu.daijia.model.entity.driver.DriverInfo; import com.atguigu.daijia.model.entity.driver.DriverLoginLog; import com.atguigu.daijia.model.entity.driver.DriverSet; +import com.atguigu.daijia.model.vo.driver.DriverLoginVo; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; import java.math.BigDecimal; @@ -87,4 +90,27 @@ public class DriverInfoServiceImpl extends ServiceImpl getDriverInfo() { + DriverLoginVo driverLoginVo = driverService.getDriverInfo(); + return Result.ok(driverLoginVo); + } } diff --git a/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/DriverService.java b/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/DriverService.java index 33a0708..11fb96e 100644 --- a/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/DriverService.java +++ b/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/DriverService.java @@ -1,5 +1,7 @@ package com.atguigu.daijia.driver.service; +import com.atguigu.daijia.model.vo.driver.DriverLoginVo; + public interface DriverService { /** @@ -9,4 +11,11 @@ public interface DriverService { * @return openid */ String login(String code); + + /** + * 获取司机登录信息 + * + * @return 司机信息 + */ + DriverLoginVo getDriverInfo(); } diff --git a/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverServiceImpl.java b/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverServiceImpl.java index 7ca55df..0eb308d 100644 --- a/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverServiceImpl.java +++ b/web/web-driver/src/main/java/com/atguigu/daijia/driver/service/impl/DriverServiceImpl.java @@ -2,8 +2,10 @@ package com.atguigu.daijia.driver.service.impl; import com.atguigu.daijia.common.constant.RedisConstant; import com.atguigu.daijia.common.result.Result; +import com.atguigu.daijia.common.util.AuthContextHolder; import com.atguigu.daijia.driver.client.DriverInfoFeignClient; import com.atguigu.daijia.driver.service.DriverService; +import com.atguigu.daijia.model.vo.driver.DriverLoginVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -41,4 +43,15 @@ public class DriverServiceImpl implements DriverService { return token; } + + /** + * 获取司机登录信息 + * + * @return 司机信息 + */ + @Override + public DriverLoginVo getDriverInfo() { + Long userId = AuthContextHolder.getUserId(); + return driverInfoFeignClient.getDriverInfo(userId).getData(); + } }