From 1ee76c252f2dbba62e0ec34cccf9eaac51de9083 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 16:25:23 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
index 54b2ecc..0b85382 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WarnController.java
@@ -106,21 +106,23 @@
return R.ok();
}
String time = LocalDateTime.now().minusMinutes(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- List<Warn> list = warnService.list(new LambdaQueryWrapper<Warn>().eq(Warn::getCarId, car.getId()).lt(Warn::getStartTime, time).orderByDesc(Warn::getCreateTime));
+ List<Warn> list = warnService.list(new LambdaQueryWrapper<Warn>().eq(Warn::getCarId, car.getId()).gt(Warn::getStartTime, time).orderByDesc(Warn::getStartTime));
CarWarnInfoResp carWarnInfoResp = new CarWarnInfoResp();
carWarnInfoResp.setVehicleNumber(vehicleNumber);
GnssDataVo gnssDataVo = upExgMsgRealLocationClient.getVehicleSpeed(vehicleNumber).getData();
- carWarnInfoResp.setSpeed(new BigDecimal(gnssDataVo.getVec1()));
- Map<String, String> geocode = null;
- try {
- String longitude = new BigDecimal(gnssDataVo.getLon()).divide(new BigDecimal(1000000)).toString();
- String latitude = new BigDecimal(gnssDataVo.getLat()).divide(new BigDecimal(1000000)).toString();
- geocode = GDMapGeocodingUtil.geocode(longitude, latitude);
- } catch (Exception e) {
- throw new RuntimeException(e);
+ if(null != gnssDataVo){
+ carWarnInfoResp.setSpeed(new BigDecimal(gnssDataVo.getVec1()));
+ Map<String, String> geocode = null;
+ try {
+ String longitude = new BigDecimal(gnssDataVo.getLon()).divide(new BigDecimal(1000000)).toString();
+ String latitude = new BigDecimal(gnssDataVo.getLat()).divide(new BigDecimal(1000000)).toString();
+ geocode = GDMapGeocodingUtil.geocode(longitude, latitude);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ String address = geocode.get("address");
+ carWarnInfoResp.setNowAddress(address);
}
- String address = geocode.get("address");
- carWarnInfoResp.setNowAddress(address);
List<WarnResp> warnList = new ArrayList<>();
for (Warn warn : list) {
WarnResp warnResp = new WarnResp();
--
Gitblit v1.7.1