From 3f21cddda071af37e902c98c8e6b0f82dd9dd303 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 六月 2025 18:34:01 +0800
Subject: [PATCH] 优化报警附件逻辑
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
index b808222..0197955 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -345,11 +345,19 @@
}
upWarnMsgAdptInfo.setInfoId(data.getAlarmId());
upWarnMsgAdptInfo.setLevel(getLevel(data.getLevel()));
- if(null != data.getLatitude()){
- upWarnMsgAdptInfo.setLongitude(data.getLatitude().intValue() * 10);
- }
- if(null != data.getLongitude()){
- upWarnMsgAdptInfo.setLatitude(data.getLongitude().intValue());
+// if(null != data.getLatitude()){
+// upWarnMsgAdptInfo.setLongitude(data.getLatitude().intValue() * 10);
+// }
+// if(null != data.getLongitude()){
+// upWarnMsgAdptInfo.setLatitude(data.getLongitude().intValue());
+// }
+ //调用获取实时定位数据
+ UPExgMsgRealLocation upExgMsgRealLocation = upExgMsgRealLocationDao.findByVehicleNoOrderByCreateTimeDesc(upWarnMsgAdptInfo.getVehicleNo());
+ if (null != upExgMsgRealLocation) {
+ GnssData gnssData = upExgMsgRealLocation.getGnssData();
+ upWarnMsgAdptInfo.setSpeed(gnssData.getVec1());
+ upWarnMsgAdptInfo.setLongitude(gnssData.getLon());
+ upWarnMsgAdptInfo.setLatitude(gnssData.getLat());
}
if(null != data.getHeight()){
upWarnMsgAdptInfo.setAltitude(data.getHeight().intValue() / 10);
--
Gitblit v1.7.1