From 45e9fc880c61e12d6415755ee2a29f79fcf81fbb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 11 三月 2022 09:49:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 152 +++++++++++++++-----------------------------------
1 files changed, 45 insertions(+), 107 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..62ec5e9 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;
@@ -84,117 +85,54 @@
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;
- }
- 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.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);
+ 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;
+ }
+ DeviceChannel deviceChannel = XmlUtil.channelContentHander(itemDevice);
+ deviceChannel.setDeviceId(device.getDeviceId());
+ logger.debug("鏀跺埌鏉ヨ嚜璁惧銆恵}銆戠殑閫氶亾: {}銆恵}銆�", device.getDeviceId(), deviceChannel.getName(), deviceChannel.getChannelId());
+ channelList.add(deviceChannel);
}
- 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")));
+ 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);
}
- 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
- 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() + "鏉�");
- }
- msg.setData(result);
- deferredResultHolder.invokeAllResult(msg);
- catalogDataCatch.del(key);
- }
-
// 鍥炲200 OK
responseAck(evt, Response.OK);
if (offLineDetector.isOnline(device.getDeviceId())) {
--
Gitblit v1.8.0