From ffceac5d832e278f985c1df5685005d59b643495 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 30 十一月 2023 17:27:07 +0800
Subject: [PATCH] 雷达报警坐标从兴趣点获取
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 317fd15..3877892 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -995,8 +995,13 @@
String uuid = IdUtils.simpleUUID();
String radarId = radarAlarmData.getRadarId();
String alarmpointName = ardAlarmRadar.getName();//鍏磋叮鐐瑰悕绉�
- Double longitude = ardAlarmRadar.getLongitude();
- Double latitude = ardAlarmRadar.getLatitude();
+ ArdAlarmpointsWell well = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(alarmpointName);
+ if(well==null)
+ {
+ return;
+ }
+ Double longitude = well.getLongitude();
+ Double latitude = well.getLatitude();
String targetId = ardAlarmRadar.getTargetId();
switch (ardAlarmRadar.getAlarmType()) {
case "杩愬姩鐩爣妫�娴�":
@@ -1004,7 +1009,7 @@
ardAlarmRadarMove.setId(uuid);
ardAlarmRadarMove.setTargetId(targetId);
ardAlarmRadarMove.setAlarmTime(radarAlarmData.getAlarmTime());
- ardAlarmRadarMove.setCreateTime(DateUtils.covertTime(new Date()));
+ ardAlarmRadarMove.setCreateTime(new Date());
ardAlarmRadarMove.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
ardAlarmRadarMove.setAlarmType("杩愬姩鐩爣妫�娴�");
ardAlarmRadarMove.setLongitude(longitude);
@@ -1059,7 +1064,7 @@
ardAlarmRadarFire.setId(uuid);
ardAlarmRadarFire.setTargetId(targetId);
ardAlarmRadarFire.setAlarmTime(radarAlarmData.getAlarmTime());
- ardAlarmRadarFire.setCreateTime(DateUtils.covertTime(new Date()));
+ ardAlarmRadarFire.setCreateTime(new Date());
ardAlarmRadarFire.setName(alarmpointName + "(" + radarAlarmData.getRadarName() + ")");
ardAlarmRadarFire.setAlarmType("鐑簮妫�娴�");
ardAlarmRadarFire.setLongitude(longitude);
@@ -1108,7 +1113,7 @@
ardAlarmRadarPump.setId(uuid);
ardAlarmRadarPump.setTargetId(targetId);
ardAlarmRadarPump.setAlarmTime(radarAlarmData.getAlarmTime());
- ardAlarmRadarPump.setCreateTime(DateUtils.covertTime(new Date()));
+ ardAlarmRadarPump.setCreateTime(new Date());
ardAlarmRadarPump.setName(ardAlarmRadar.getName() + "(" + radarAlarmData.getRadarName() + ")");
ardAlarmRadarPump.setAlarmType("闆疯揪鎶芥补鏈哄仠鏈�");
ardAlarmRadarPump.setUpdateTime(radarAlarmData.getAlarmTime());
--
Gitblit v1.9.3