From 0b6189c1c208a4f1c4cd4b230dba10b3581d1ff9 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 16 五月 2024 16:01:16 +0800
Subject: [PATCH] fix: 获取司机配送员信息接口修改
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java
index c5a00b1..5330150 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/UserStatisticController.java
@@ -4,11 +4,15 @@
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.core.entity.User;
+import cn.exrick.xboot.your.entity.Car;
import cn.exrick.xboot.your.entity.UserStatistic;
+import cn.exrick.xboot.your.service.ICarService;
import cn.exrick.xboot.your.service.IUserStatisticService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +35,9 @@
@Autowired
private IUserStatisticService iUserStatisticService;
+ @Autowired
+ private ICarService iCarService;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<UserStatistic> get(@PathVariable String id) {
@@ -51,6 +58,58 @@
return new ResultUtil<UserStatistic>().setData(userStatistic);
}
+ @RequestMapping(value = "/getAllByUserId", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃鐢ㄦ埛id鑾峰彇缁熻淇℃伅")
+ public Result<UserStatistic> getStatisticByUserId(String userId,int type) {
+ UserStatistic userStatistic0 = getById(userId);
+ String otherId = getOtherIdFromCar(userId,type);
+ UserStatistic userStatistic1 = getById(otherId);
+ if(type==0){//椹鹃┒鍛�
+ userStatistic0.setSends(userStatistic1.getSends());
+ userStatistic0.setService(userStatistic1.getService());
+ userStatistic0.setSends2(userStatistic1.getSends2());
+ userStatistic0.setAbnormalOpen(userStatistic1.getAbnormalOpen());
+ userStatistic0.setLikesRate(userStatistic1.getLikesRate());
+ }else{//閰嶉�佸憳
+ userStatistic0.setSafeDriving(userStatistic1.getSafeDriving());
+ userStatistic0.setOutCar(userStatistic1.getOutCar());
+ userStatistic0.setDriving(userStatistic1.getDriving());
+ userStatistic0.setFatigueDriving(userStatistic1.getFatigueDriving());
+ userStatistic0.setSmoking(userStatistic1.getSmoking());
+ userStatistic0.setNoBelt(userStatistic1.getNoBelt());
+ userStatistic0.setLikes(userStatistic1.getLikes());
+ }
+ return new ResultUtil<UserStatistic>().setData(userStatistic0);
+ }
+
+ public UserStatistic getById(String userId){
+ QueryWrapper<UserStatistic> wrapper = new QueryWrapper<>();
+ wrapper.eq("user_id",userId);
+ UserStatistic userStatistic = iUserStatisticService.getOne(wrapper);
+ if(userStatistic==null){
+ userStatistic = new UserStatistic();
+ }
+ return userStatistic;
+ }
+
+ public String getOtherIdFromCar(String userId,int type){
+ QueryWrapper<Car> wrapper = new QueryWrapper<>();
+ if(type==0){
+ wrapper.eq("user_id",userId);
+ Car myCar = iCarService.getOne(wrapper);
+ if(myCar!=null){
+ return myCar.getFollowUserId();
+ }
+ }else if(type==1){
+ wrapper.eq("follow_user_id",userId);
+ Car myCar = iCarService.getOne(wrapper);
+ if(myCar!=null){
+ return myCar.getUserId();
+ }
+ }
+ return null;
+ }
+
@RequestMapping(value = "/getAll", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
public Result<List<UserStatistic>> getAll() {
--
Gitblit v1.9.1