From 22441ad5a130b1802af2c5ebe5083e8297edb682 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:23:46 +0800
Subject: [PATCH] Merge pull request #643 from XiaoQiTong/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java
index 78ba61a..1544289 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceInfoResponseMessageHandler.java
@@ -20,10 +20,12 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
+import javax.sip.ServerTransaction;
import javax.sip.SipException;
import javax.sip.message.Response;
import java.text.ParseException;
@@ -73,11 +75,17 @@
logger.warn("[鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅,浣嗘槸璁惧宸茬粡绂荤嚎]锛�" + (device != null ? device.getDeviceId():"" ));
return;
}
+ ServerTransaction serverTransaction = getServerTransaction(evt);
try {
rootElement = getRootElement(evt, device.getCharset());
- if (rootElement == null) {
+
+ if (rootElement == null) {
logger.warn("[ 鎺ユ敹鍒癉eviceInfo搴旂瓟娑堟伅 ] content cannot be null, {}", evt.getRequest());
- responseAck(evt, Response.BAD_REQUEST);
+ try {
+ responseAck(serverTransaction, Response.BAD_REQUEST);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 DeviceInfo搴旂瓟娑堟伅 BAD_REQUEST: {}", e.getMessage());
+ }
return;
}
Element deviceIdElement = rootElement.element("DeviceID");
@@ -88,7 +96,7 @@
device.setManufacturer(getText(rootElement, "Manufacturer"));
device.setModel(getText(rootElement, "Model"));
device.setFirmware(getText(rootElement, "Firmware"));
- if (StringUtils.isEmpty(device.getStreamMode())) {
+ if (ObjectUtils.isEmpty(device.getStreamMode())) {
device.setStreamMode("UDP");
}
deviceService.updateDevice(device);
@@ -97,17 +105,16 @@
msg.setKey(key);
msg.setData(device);
deferredResultHolder.invokeAllResult(msg);
- // 鍥炲200 OK
- responseAck(evt, Response.OK);
} catch (DocumentException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- } catch (SipException e) {
- e.printStackTrace();
+ throw new RuntimeException(e);
}
+ try {
+ // 鍥炲200 OK
+ responseAck(serverTransaction, Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 DeviceInfo搴旂瓟娑堟伅 200: {}", e.getMessage());
+ }
+
}
@Override
--
Gitblit v1.8.0