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/MobilePositionNotifyMessageHandler.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java
index 471b2d7..2ac3b83 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java
@@ -1,13 +1,11 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.cmd;
import com.genersoft.iot.vmp.conf.UserSetting;
-import com.genersoft.iot.vmp.gb28181.bean.BaiduPoint;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.notify.NotifyMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.GpsUtil;
@@ -79,16 +77,38 @@
mobilePosition.setAltitude(0.0);
}
mobilePosition.setReportSource("Mobile Position");
- BaiduPoint bp = new BaiduPoint();
- bp = GpsUtil.Wgs84ToBd09(String.valueOf(mobilePosition.getLongitude()), String.valueOf(mobilePosition.getLatitude()));
- logger.info("鐧惧害鍧愭爣锛�" + bp.getBdLng() + ", " + bp.getBdLat());
- mobilePosition.setGeodeticSystem("BD-09");
- mobilePosition.setCnLng(bp.getBdLng());
- mobilePosition.setCnLat(bp.getBdLat());
- 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(mobilePosition.getChannelId());
+ 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);
//鍥炲 200 OK
responseAck(evt, Response.OK);
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
--
Gitblit v1.8.0