From 1553b39b4547418774ab2bd6da72f75bfd14b972 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期二, 29 三月 2022 10:04:28 +0800
Subject: [PATCH] 修复级联的国标通道无经纬度问题
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 160 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 126 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
index dfd0eb2..47ef6fa 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
@@ -2,9 +2,8 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.session.CatalogDataCatch;
@@ -15,7 +14,9 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
import com.genersoft.iot.vmp.gb28181.utils.NumericUtil;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.GpsUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.dom4j.DocumentException;
import org.dom4j.Element;
@@ -24,6 +25,7 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
@@ -67,6 +69,13 @@
@Autowired
private EventPublisher publisher;
+ //by brewswang
+ @Autowired
+ private UserSetup userSetup;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
+
@Override
public void afterPropertiesSet() throws Exception {
responseMessageHandler.addHandler(cmdType, this);
@@ -85,41 +94,59 @@
return;
}
int sumNum = Integer.parseInt(sumNumElement.getText());
- Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
- if (deviceListIterator != null) {
- List<DeviceChannel> channelList = new ArrayList<>();
- // 閬嶅巻DeviceList
- while (deviceListIterator.hasNext()) {
- Element itemDevice = deviceListIterator.next();
- Element channelDeviceElement = itemDevice.element("DeviceID");
- if (channelDeviceElement == null) {
- continue;
+ if (sumNum == 0) {
+ // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹
+ storager.cleanChannelsForDevice(device.getDeviceId());
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ WVPResult<Object> result = new WVPResult<>();
+ result.setCode(0);
+ result.setData(device);
+ msg.setData(result);
+ result.setMsg("鏇存柊鎴愬姛锛屽叡0鏉�");
+ deferredResultHolder.invokeAllResult(msg);
+ catalogDataCatch.del(key);
+ }else {
+ Iterator<Element> deviceListIterator = deviceListElement.elementIterator();
+ if (deviceListIterator != null) {
+ List<DeviceChannel> channelList = new ArrayList<>();
+ // 閬嶅巻DeviceList
+ while (deviceListIterator.hasNext()) {
+ Element itemDevice = deviceListIterator.next();
+ Element channelDeviceElement = itemDevice.element("DeviceID");
+ if (channelDeviceElement == null) {
+ continue;
+ }
+ //by brewswang
+ if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Longitude"))) {//濡傛灉鍖呭惈浣嶇疆淇℃伅锛屽氨鏇存柊涓�涓嬩綅缃�
+ processNotifyMobilePosition(evt, itemDevice);
+ }
+
+ DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice);
+ deviceChannel.setDeviceId(device.getDeviceId());
+ logger.debug("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾: {}銆恵}銆�", device.getDeviceId(), deviceChannel.getName(), deviceChannel.getChannelId());
+ channelList.add(deviceChannel);
}
- DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice);
- deviceChannel.setDeviceId(device.getDeviceId());
- logger.debug("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾: {}銆恵}銆�", device.getDeviceId(), deviceChannel.getName(), deviceChannel.getChannelId());
- channelList.add(deviceChannel);
- }
- catalogDataCatch.put(key, sumNum, device, channelList);
- if (catalogDataCatch.get(key).size() == sumNum) {
- // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹
- boolean resetChannelsResult = storager.resetChannels(device.getDeviceId(), catalogDataCatch.get(key));
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- WVPResult<Object> result = new WVPResult<>();
- result.setCode(0);
- result.setData(device);
- if (resetChannelsResult) {
- result.setMsg("鏇存柊鎴愬姛锛屽叡" + sumNum + "鏉★紝宸叉洿鏂�" + catalogDataCatch.get(key).size() + "鏉�");
- }else {
- result.setMsg("鎺ユ敹鎴愬姛锛屽啓鍏ュけ璐ワ紝鍏�" + sumNum + "鏉★紝宸叉帴鏀�" + catalogDataCatch.get(key).size() + "鏉�");
+ catalogDataCatch.put(key, sumNum, device, channelList);
+ if (catalogDataCatch.get(key).size() == sumNum) {
+ // 鏁版嵁宸茬粡瀹屾暣鎺ユ敹
+ boolean resetChannelsResult = storager.resetChannels(device.getDeviceId(), catalogDataCatch.get(key));
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ WVPResult<Object> result = new WVPResult<>();
+ result.setCode(0);
+ result.setData(device);
+ if (resetChannelsResult || sumNum ==0) {
+ result.setMsg("鏇存柊鎴愬姛锛屽叡" + sumNum + "鏉★紝宸叉洿鏂�" + catalogDataCatch.get(key).size() + "鏉�");
+ }else {
+ result.setMsg("鎺ユ敹鎴愬姛锛屽啓鍏ュけ璐ワ紝鍏�" + sumNum + "鏉★紝宸叉帴鏀�" + catalogDataCatch.get(key).size() + "鏉�");
+ }
+ msg.setData(result);
+ deferredResultHolder.invokeAllResult(msg);
+ catalogDataCatch.del(key);
}
- msg.setData(result);
- deferredResultHolder.invokeAllResult(msg);
- catalogDataCatch.del(key);
}
-
// 鍥炲200 OK
responseAck(evt, Response.OK);
if (offLineDetector.isOnline(device.getDeviceId())) {
@@ -141,4 +168,69 @@
public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
}
+
+ /**
+ * 澶勭悊璁惧浣嶇疆鐨勬洿鏂�
+ *
+ * @param evt, itemDevice
+ */
+ private void processNotifyMobilePosition(RequestEvent evt, Element itemDevice) {
+ try {
+ // 鍥炲 200 OK
+ Element rootElement = getRootElement(evt);
+ MobilePosition mobilePosition = new MobilePosition();
+ Element deviceIdElement = rootElement.element("DeviceID");
+ String deviceId = deviceIdElement.getTextTrim().toString();
+ Device device = redisCatchStorage.getDevice(deviceId);
+ if (device != null) {
+ if (!StringUtils.isEmpty(device.getName())) {
+ mobilePosition.setDeviceName(device.getName());
+ }
+ }
+ mobilePosition.setDeviceId(XmlUtil.getText(rootElement, "DeviceID"));
+
+ String time = XmlUtil.getText(itemDevice, "Time");
+ if(time==null){
+ time = XmlUtil.getText(itemDevice, "EndTime");
+ }
+ mobilePosition.setTime(time);
+ String longitude = XmlUtil.getText(itemDevice, "Longitude");
+ if(longitude!=null) {
+ mobilePosition.setLongitude(Double.parseDouble(longitude));
+ }
+ String latitude = XmlUtil.getText(itemDevice, "Latitude");
+ if(latitude!=null) {
+ mobilePosition.setLatitude(Double.parseDouble(latitude));
+ }
+ if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Speed"))) {
+ mobilePosition.setSpeed(Double.parseDouble(XmlUtil.getText(itemDevice, "Speed")));
+ } else {
+ mobilePosition.setSpeed(0.0);
+ }
+ if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Direction"))) {
+ mobilePosition.setDirection(Double.parseDouble(XmlUtil.getText(itemDevice, "Direction")));
+ } else {
+ mobilePosition.setDirection(0.0);
+ }
+ if (NumericUtil.isDouble(XmlUtil.getText(itemDevice, "Altitude"))) {
+ mobilePosition.setAltitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Altitude")));
+ } else {
+ 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 (!userSetup.getSavePositionHistory()) {
+ storager.clearMobilePositionsByDeviceId(deviceId);
+ }
+ storager.insertMobilePosition(mobilePosition);
+ responseAck(evt, Response.OK);
+ } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0