From cd117ed22825b8f442e0f2281678f4549be3e109 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 23 九月 2022 23:15:39 +0800
Subject: [PATCH] dialog去除以及异常情况处理优化
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java | 45 +++++++++++++++++++--------------------------
1 files changed, 19 insertions(+), 26 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
index 1febeae..366c7ad 100644
--- 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
@@ -50,12 +50,12 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element element) {
- Element rootElement = null;
+
+ ServerTransaction serverTransaction = getServerTransaction(evt);
+
try {
+ Element rootElement = getRootElement(evt, device.getCharset());
- ServerTransaction serverTransaction = getServerTransaction(evt);
-
- rootElement = getRootElement(evt, device.getCharset());
if (rootElement == null) {
logger.warn("[ 璁惧棰勭疆浣嶆煡璇㈠簲绛� ] content cannot be null, {}", evt.getRequest());
responseAck(serverTransaction, Response.BAD_REQUEST);
@@ -66,32 +66,29 @@
//璇ュ瓧娈靛彲鑳戒负閫氶亾鎴栧垯璁惧鐨刬d
String deviceId = getText(rootElement, "DeviceID");
String key = DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + deviceId;
- if (snElement == null || presetListNumElement == null) {
+ if (snElement == null || presetListNumElement == null) {
responseAck(serverTransaction, Response.BAD_REQUEST, "xml error");
return;
}
int sumNum = Integer.parseInt(presetListNumElement.attributeValue("Num"));
List<PresetQuerySipReq> presetQuerySipReqList = new ArrayList<>();
if (sumNum > 0) {
- for (Iterator<Element> presetIterator = presetListNumElement.elementIterator();presetIterator.hasNext();){
+ 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".equalsIgnoreCase(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);
@@ -99,13 +96,9 @@
deferredResultHolder.invokeAllResult(requestMessage);
responseAck(serverTransaction, Response.OK);
} catch (DocumentException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- } catch (SipException e) {
- e.printStackTrace();
+ logger.error("[瑙ｆ瀽xml]澶辫触: ", e);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 璁惧棰勭疆浣嶆煡璇㈠簲绛斿鐞�: {}", e.getMessage());
}
}
--
Gitblit v1.8.0