From 4109495b9c51a4bbd8b0a7c3c69093909d2e33e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 07 四月 2025 18:55:05 +0800
Subject: [PATCH] 修改接口bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java
index 570f7e6..6389a8e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CarController.java
@@ -7,6 +7,7 @@
import com.ruoyi.dataInterchange.api.feignClient.PlaybackMsgClient;
import com.ruoyi.dataInterchange.api.feignClient.RealVideoMsgClient;
import com.ruoyi.dataInterchange.api.feignClient.UPExgMsgRealLocationClient;
+import com.ruoyi.dataInterchange.api.vo.GnssDataVo;
import com.ruoyi.dataInterchange.api.vo.OrderTravelVo;
import com.ruoyi.dataInterchange.api.vo.UPPlaybackMsgStartupAckVo;
import com.ruoyi.dataInterchange.api.vo.UPRealvideoMsgStartupAckVo;
@@ -22,12 +23,14 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.List;
@@ -61,6 +64,9 @@
@Resource
private ICarTypeService carTypeService;
+ @Resource
+ private RedisTemplate redisTemplate;
+
@GetMapping("/getCarList")
@ApiOperation(value = "获取车辆列表", tags = {"车辆管理"})
@@ -83,7 +89,11 @@
Driver driver = driverService.getOne(new LambdaQueryWrapper<Driver>().eq(Driver::getVehicleNumber, car.getVehicleNumber()).eq(Driver::getStatus, 1));
Enterprise enterprise = enterpriseService.getById(car.getEnterpriseId());
car.setEnterpriseName(enterprise.getName());
- car.setDriverName(driver.getName());
+ if (null != driver) {
+ car.setDriverName(driver.getName());
+ car.setDriverPhone(driver.getPhone());
+ car.setDrivingLicenseNumber(driver.getDrivingLicenceFile());
+ }
return R.ok(car);
}
@@ -184,10 +194,10 @@
@ApiOperation(value = "获取车辆状态汇总数据和公司总数等", tags = {"首页"})
public R<CarStatusCount> getCarStatusCount() {
List<Car> list = carService.list();
- long online = list.stream().filter(s -> s.getStatus() == 1).count();
- long offline = list.stream().filter(s -> s.getStatus() == 3).count();
- long breakdown = list.stream().filter(s -> s.getStatus() == 4).count();
- long abnormal = list.stream().filter(s -> s.getStatus() == 2).count();
+ long online = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 1).count();
+ long offline = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 3).count();
+ long breakdown = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 4).count();
+ long abnormal = list.isEmpty() ? 0 : list.stream().filter(s -> s.getStatus() == 2).count();
CarStatusCount carStatusCount = new CarStatusCount();
carStatusCount.setOffline(offline);
carStatusCount.setOnline(online);
@@ -201,4 +211,20 @@
return R.ok(carStatusCount);
}
+
+ @GetMapping("/getMapCarList")
+ @ApiOperation(value = "获取地图司机数据", tags = {"首页"})
+ public R<List<Car>> getMapCarList() {
+ List<Car> list = carService.list(new LambdaQueryWrapper<Car>().eq(Car::getStatus, 1));
+ for (Car car : list) {
+ Long s = (null == car.getDownlineTime() ? LocalDateTime.now() : car.getDownlineTime()).toEpochSecond(ZoneOffset.ofHours(8)) - car.getOnlineTime().toEpochSecond(ZoneOffset.ofHours(8));
+ car.setDrivingTime(s / 60);
+ GnssDataVo gnssDataVo = (GnssDataVo) redisTemplate.opsForValue().get("location:" + car.getVehicleNumber());
+ if (null != gnssDataVo) {
+ car.setLongitude(new BigDecimal(gnssDataVo.getLon()).divide(new BigDecimal(1000000)).toString());
+ car.setLatitude(new BigDecimal(gnssDataVo.getLat()).divide(new BigDecimal(1000000)).toString());
+ }
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1