From f20682cc6fa84b96c1ecac294dd2283032924699 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 16 十一月 2020 14:00:58 +0800
Subject: [PATCH] Merge pull request #1 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index 06afc35..b976f3b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -215,12 +215,27 @@
deviceChannel.setPort(itemDevice.element("Port") == null ? 0
: Integer.parseInt(XmlUtil.getText(itemDevice, "Port")));
deviceChannel.setPassword(XmlUtil.getText(itemDevice, "Password"));
- deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00
- : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
- deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00
- : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
- deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0
- : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
+ if (itemDevice.element("Longitute")==null) {
+ deviceChannel.setLongitude(0.00);
+ } else {
+ deviceChannel.setLongitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
+ }
+ if (itemDevice.element("Latitute") == null) {
+ deviceChannel.setLatitude(0.00);
+ } else {
+ deviceChannel.setLatitude(Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
+ }
+ if (itemDevice.element("PTZType") == null) {
+ deviceChannel.setPTZType(0);
+ } else {
+ deviceChannel.setPTZType(Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
+ }
+ // deviceChannel.setLongitude(itemDevice.element("Longitude") == null ? 0.00
+ // : Double.parseDouble(XmlUtil.getText(itemDevice, "Longitude")));
+ // deviceChannel.setLatitude(itemDevice.element("Latitude") == null ? 0.00
+ // : Double.parseDouble(XmlUtil.getText(itemDevice, "Latitude")));
+ // deviceChannel.setPTZType(itemDevice.element("PTZType") == null ? 0
+ // : Integer.parseInt(XmlUtil.getText(itemDevice, "PTZType")));
deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
storager.updateChannel(device.getDeviceId(), deviceChannel);
}
--
Gitblit v1.8.0