From 10cb58391ab402d0e761a7c17f3740c081dc9042 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 04 七月 2022 01:08:26 +0800
Subject: [PATCH] 修复轨迹的储存与查询展示
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
index 6a23dfa..08874b8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/AlarmNotifyMessageHandler.java
@@ -80,7 +80,6 @@
Element deviceIdElement = rootElement.element("DeviceID");
String channelId = deviceIdElement.getText().toString();
-
DeviceAlarm deviceAlarm = new DeviceAlarm();
deviceAlarm.setDeviceId(device.getDeviceId());
deviceAlarm.setChannelId(channelId);
@@ -118,16 +117,38 @@
mobilePosition.setLongitude(deviceAlarm.getLongitude());
mobilePosition.setLatitude(deviceAlarm.getLatitude());
mobilePosition.setReportSource("GPS Alarm");
- // 榛樿鏉ユ簮鍧愭爣绯讳负WGS-84澶勭悊
- Double[] gcj02Point = Coordtransform.WGS84ToGCJ02(mobilePosition.getLongitude(), mobilePosition.getLatitude());
- logger.info("GCJ02鍧愭爣锛�" + gcj02Point[0] + ", " + gcj02Point[1]);
- mobilePosition.setGeodeticSystem("GCJ-02");
- mobilePosition.setCnLng(gcj02Point[0] + "");
- mobilePosition.setCnLat(gcj02Point[1] + "");
- if (!userSetting.getSavePositionHistory()) {
- storager.clearMobilePositionsByDeviceId(device.getDeviceId());
+ if ("WGS84".equals(device.getGeoCoordSys())) {
+ mobilePosition.setLongitudeWgs84(mobilePosition.getLongitude());
+ mobilePosition.setLatitudeWgs84(mobilePosition.getLatitude());
+ Double[] position = Coordtransform.WGS84ToGCJ02(mobilePosition.getLongitude(), mobilePosition.getLatitude());
+ mobilePosition.setLongitudeGcj02(position[0]);
+ mobilePosition.setLatitudeGcj02(position[1]);
+ }else if ("GCJ02".equals(device.getGeoCoordSys())) {
+ mobilePosition.setLongitudeGcj02(mobilePosition.getLongitude());
+ mobilePosition.setLatitudeGcj02(mobilePosition.getLatitude());
+ Double[] position = Coordtransform.GCJ02ToWGS84(mobilePosition.getLongitude(), mobilePosition.getLatitude());
+ mobilePosition.setLongitudeWgs84(position[0]);
+ mobilePosition.setLatitudeWgs84(position[1]);
+ }else {
+ mobilePosition.setLongitudeGcj02(0.00);
+ mobilePosition.setLatitudeGcj02(0.00);
+ mobilePosition.setLongitudeWgs84(0.00);
+ mobilePosition.setLatitudeWgs84(0.00);
}
- storager.insertMobilePosition(mobilePosition);
+ if (userSetting.getSavePositionHistory()) {
+ storager.insertMobilePosition(mobilePosition);
+ }
+ // 鏇存柊device channel 鐨勭粡绾害
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setDeviceId(device.getDeviceId());
+ deviceChannel.setChannelId(channelId);
+ deviceChannel.setLongitude(mobilePosition.getLongitude());
+ deviceChannel.setLatitude(mobilePosition.getLatitude());
+ deviceChannel.setLongitudeWgs84(mobilePosition.getLongitudeWgs84());
+ deviceChannel.setLatitudeWgs84(mobilePosition.getLatitudeWgs84());
+ deviceChannel.setLongitudeGcj02(mobilePosition.getLongitudeGcj02());
+ deviceChannel.setLatitudeGcj02(mobilePosition.getLatitudeGcj02());
+ storager.updateChannelPosition(deviceChannel);
}
}
if (!StringUtils.isEmpty(deviceAlarm.getDeviceId())) {
--
Gitblit v1.8.0