From 4ad32c37e3317fb6cb7cbfb034b53d3220c27db4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 五月 2025 17:59:16 +0800
Subject: [PATCH] 优化报警
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPExgMsgRegisterController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPExgMsgRegisterController.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPExgMsgRegisterController.java
index f2c5a78..7ba2d99 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPExgMsgRegisterController.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPExgMsgRegisterController.java
@@ -3,7 +3,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.dataInterchange.api.vo.UPExgMsgRegisterVo;
+import com.ruoyi.dataInterchange.dao.UPExgMsgRealLocationDao;
import com.ruoyi.dataInterchange.dao.UPExgMsgRegisterDao;
+import com.ruoyi.dataInterchange.model.GnssData;
+import com.ruoyi.dataInterchange.model.UPExgMsgRealLocation;
import com.ruoyi.dataInterchange.model.UPExgMsgRegister;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -25,6 +29,9 @@
@Resource
private UPExgMsgRegisterDao upExgMsgRegisterDao;
+
+ @Resource
+ private UPExgMsgRealLocationDao upExgMsgRealLocationDao;
/**
@@ -42,6 +49,14 @@
UPExgMsgRegister register = iterator.next();
UPExgMsgRegisterVo vo = new UPExgMsgRegisterVo();
BeanUtils.copyProperties(register, vo);
+ UPExgMsgRealLocation realLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(register.getVehicleNo());
+ if (null != realLocation) {
+ GnssData gnssData = realLocation.getGnssData();
+ String longitude = new BigDecimal(gnssData.getLon()).divide(new BigDecimal(1000000)).toString();
+ String latitude = new BigDecimal(gnssData.getLat()).divide(new BigDecimal(1000000)).toString();
+ vo.setLongitude(longitude);
+ vo.setLatitude(latitude);
+ }
voList.add(vo);
}
@@ -50,6 +65,14 @@
for (UPExgMsgRegister register : list) {
UPExgMsgRegisterVo vo = new UPExgMsgRegisterVo();
BeanUtils.copyProperties(register, vo);
+ UPExgMsgRealLocation realLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(register.getVehicleNo());
+ if (null != realLocation) {
+ GnssData gnssData = realLocation.getGnssData();
+ String longitude = new BigDecimal(gnssData.getLon()).divide(new BigDecimal(1000000)).toString();
+ String latitude = new BigDecimal(gnssData.getLat()).divide(new BigDecimal(1000000)).toString();
+ vo.setLongitude(longitude);
+ vo.setLatitude(latitude);
+ }
voList.add(vo);
}
}
--
Gitblit v1.7.1