From 0209dc89c9d5a65aaa1c6e3ae8140dfdb5020dcb Mon Sep 17 00:00:00 2001
From: SaltFish <42058801+SaltFish001@users.noreply.github.com>
Date: 星期四, 10 二月 2022 10:29:36 +0800
Subject: [PATCH] Update MediaServiceImpl.java
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 81 +---------------------------------------
1 files changed, 3 insertions(+), 78 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 9e15068..dfd0eb2 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
@@ -14,6 +14,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
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.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.dom4j.DocumentException;
@@ -94,85 +95,9 @@
if (channelDeviceElement == null) {
continue;
}
- String channelDeviceId = channelDeviceElement.getText();
- Element channdelNameElement = itemDevice.element("Name");
- String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : "";
- Element statusElement = itemDevice.element("Status");
- String status = statusElement != null ? statusElement.getText().toString() : "ON";
- DeviceChannel deviceChannel = new DeviceChannel();
- deviceChannel.setName(channelName);
+ DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice);
deviceChannel.setDeviceId(device.getDeviceId());
- String now = this.format.format(new Date(System.currentTimeMillis()));
- deviceChannel.setCreateTime(now);
- deviceChannel.setUpdateTime(now);
- deviceChannel.setChannelId(channelDeviceId);
- // ONLINE OFFLINE HIKVISION DS-7716N-E4 NVR鐨勫吋瀹规�у鐞�
- if (status.equals("ON") || status.equals("On") || status.equals("ONLINE")) {
- deviceChannel.setStatus(1);
- }
- if (status.equals("OFF") || status.equals("Off") || status.equals("OFFLINE")) {
- deviceChannel.setStatus(0);
- }
-
- deviceChannel.setManufacture(getText(itemDevice, "Manufacturer"));
- deviceChannel.setModel(getText(itemDevice, "Model"));
- deviceChannel.setOwner(getText(itemDevice, "Owner"));
- deviceChannel.setCivilCode(getText(itemDevice, "CivilCode"));
- deviceChannel.setBlock(getText(itemDevice, "Block"));
- deviceChannel.setAddress(getText(itemDevice, "Address"));
- if (getText(itemDevice, "Parental") == null || getText(itemDevice, "Parental") == "") {
- deviceChannel.setParental(0);
- } else {
- deviceChannel.setParental(Integer.parseInt(getText(itemDevice, "Parental")));
- }
- deviceChannel.setParentId(getText(itemDevice, "ParentID"));
- if (getText(itemDevice, "SafetyWay") == null || getText(itemDevice, "SafetyWay") == "") {
- deviceChannel.setSafetyWay(0);
- } else {
- deviceChannel.setSafetyWay(Integer.parseInt(getText(itemDevice, "SafetyWay")));
- }
- if (getText(itemDevice, "RegisterWay") == null || getText(itemDevice, "RegisterWay") == "") {
- deviceChannel.setRegisterWay(1);
- } else {
- deviceChannel.setRegisterWay(Integer.parseInt(getText(itemDevice, "RegisterWay")));
- }
- deviceChannel.setCertNum(getText(itemDevice, "CertNum"));
- if (getText(itemDevice, "Certifiable") == null || getText(itemDevice, "Certifiable") == "") {
- deviceChannel.setCertifiable(0);
- } else {
- deviceChannel.setCertifiable(Integer.parseInt(getText(itemDevice, "Certifiable")));
- }
- if (getText(itemDevice, "ErrCode") == null || getText(itemDevice, "ErrCode") == "") {
- deviceChannel.setErrCode(0);
- } else {
- deviceChannel.setErrCode(Integer.parseInt(getText(itemDevice, "ErrCode")));
- }
- deviceChannel.setEndTime(getText(itemDevice, "EndTime"));
- deviceChannel.setSecrecy(getText(itemDevice, "Secrecy"));
- deviceChannel.setIpAddress(getText(itemDevice, "IPAddress"));
- if (getText(itemDevice, "Port") == null || getText(itemDevice, "Port") == "") {
- deviceChannel.setPort(0);
- } else {
- deviceChannel.setPort(Integer.parseInt(getText(itemDevice, "Port")));
- }
- deviceChannel.setPassword(getText(itemDevice, "Password"));
- if (NumericUtil.isDouble(getText(itemDevice, "Longitude"))) {
- deviceChannel.setLongitude(Double.parseDouble(getText(itemDevice, "Longitude")));
- } else {
- deviceChannel.setLongitude(0.00);
- }
- if (NumericUtil.isDouble(getText(itemDevice, "Latitude"))) {
- deviceChannel.setLatitude(Double.parseDouble(getText(itemDevice, "Latitude")));
- } else {
- deviceChannel.setLatitude(0.00);
- }
- Element InfoNode = channelDeviceElement.element("Info");
- if (getText(InfoNode, "PTZType") == null || getText(InfoNode, "PTZType") == "") {
- deviceChannel.setPTZType(0);
- } else {
- deviceChannel.setPTZType(Integer.parseInt(getText(InfoNode, "PTZType")));
- }
- deviceChannel.setHasAudio(true); // 榛樿鍚湁闊抽锛屾挱鏀炬椂鍐嶆鏌ユ槸鍚︽湁闊抽鍙婃槸鍚AC
+ logger.debug("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾: {}銆恵}銆�", device.getDeviceId(), deviceChannel.getName(), deviceChannel.getChannelId());
channelList.add(deviceChannel);
}
--
Gitblit v1.8.0