From 0e9cb5ceb6baeed953bd64a4b71d9d6bacb1798c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 06 九月 2023 09:31:43 +0800
Subject: [PATCH] Merge pull request #1048 from lunasaw/wvp-dev-0901
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
old mode 100644
new mode 100755
index 3662600..862a8ee
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
@@ -1,12 +1,13 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
-import com.genersoft.iot.vmp.domain.req.PresetQuerySipReq;
+import com.genersoft.iot.vmp.gb28181.bean.PresetQuerySipReq;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
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.response.ResponseMessageHandler;
+import gov.nist.javax.sip.message.SIPRequest;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.slf4j.Logger;
@@ -26,6 +27,9 @@
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+/**
+ * 璁惧棰勭疆浣嶆煡璇㈠簲绛�
+ */
@Component
public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
@@ -46,59 +50,65 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element element) {
- Element rootElement = null;
- try {
- rootElement = getRootElement(evt, device.getCharset());
+ SIPRequest request = (SIPRequest) evt.getRequest();
+
+ try {
+ Element rootElement = getRootElement(evt, device.getCharset());
+
+ if (rootElement == null) {
+ logger.warn("[ 璁惧棰勭疆浣嶆煡璇㈠簲绛� ] content cannot be null, {}", evt.getRequest());
+ try {
+ responseAck(request, Response.BAD_REQUEST);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璁惧棰勭疆浣嶆煡璇㈠簲绛斿鐞�: {}", e.getMessage());
+ }
+ return;
+ }
Element presetListNumElement = rootElement.element("PresetList");
Element snElement = rootElement.element("SN");
//璇ュ瓧娈靛彲鑳戒负閫氶亾鎴栧垯璁惧鐨刬d
String deviceId = getText(rootElement, "DeviceID");
String key = DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + deviceId;
- if (snElement == null || presetListNumElement == null) {
- responseAck(evt, Response.BAD_REQUEST, "xml error");
+ if (snElement == null || presetListNumElement == null) {
+ try {
+ responseAck(request, Response.BAD_REQUEST, "xml error");
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璁惧棰勭疆浣嶆煡璇㈠簲绛斿鐞�: {}", e.getMessage());
+ }
return;
}
int sumNum = Integer.parseInt(presetListNumElement.attributeValue("Num"));
List<PresetQuerySipReq> presetQuerySipReqList = new ArrayList<>();
- if (sumNum == 0) {
- // 鏁版嵁鏃犻缃綅淇℃伅
-
-
- }else {
- for (Iterator<Element> presetIterator = presetListNumElement.elementIterator();presetIterator.hasNext();){
+ if (sumNum > 0) {
+ for (Iterator<Element> presetIterator = presetListNumElement.elementIterator(); presetIterator.hasNext(); ) {
Element itemListElement = presetIterator.next();
PresetQuerySipReq presetQuerySipReq = new PresetQuerySipReq();
- for (Iterator<Element> itemListIterator = itemListElement.elementIterator();itemListIterator.hasNext();){
- // 閬嶅巻item
- Element itemOne = itemListIterator.next();
- String name = itemOne.getName();
- String textTrim = itemOne.getTextTrim();
- if("PresetID".equals(name)){
- presetQuerySipReq.setPresetId(textTrim);
- }else {
- presetQuerySipReq.setPresetName(textTrim);
- }
+ for (Iterator<Element> itemListIterator = itemListElement.elementIterator(); itemListIterator.hasNext(); ) {
+ // 閬嶅巻item
+ Element itemOne = itemListIterator.next();
+ String name = itemOne.getName();
+ String textTrim = itemOne.getTextTrim();
+ if ("PresetID".equalsIgnoreCase(name)) {
+ presetQuerySipReq.setPresetId(textTrim);
+ } else {
+ presetQuerySipReq.setPresetName(textTrim);
+ }
}
presetQuerySipReqList.add(presetQuerySipReq);
-
-
}
-
}
RequestMessage requestMessage = new RequestMessage();
requestMessage.setKey(key);
requestMessage.setData(presetQuerySipReqList);
deferredResultHolder.invokeAllResult(requestMessage);
- responseAck(evt, Response.OK);
+ try {
+ responseAck(request, Response.OK);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璁惧棰勭疆浣嶆煡璇㈠簲绛斿鐞�: {}", e.getMessage());
+ }
} catch (DocumentException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- } catch (SipException e) {
- e.printStackTrace();
+ logger.error("[瑙ｆ瀽xml]澶辫触: ", e);
}
}
--
Gitblit v1.8.0