From abb60593cb77e9e9b6e67e8276fc416c2aede43f Mon Sep 17 00:00:00 2001
From: lin <18010473990@163.com>
Date: 星期六, 08 一月 2022 17:35:00 +0800
Subject: [PATCH] 优化级联平台GPS订阅
---
src/main/java/com/genersoft/iot/vmp/service/bean/CatalogSubscribeTask.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/CatalogSubscribeTask.java b/src/main/java/com/genersoft/iot/vmp/service/bean/CatalogSubscribeTask.java
index eb179d7..cfaef71 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/bean/CatalogSubscribeTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/bean/CatalogSubscribeTask.java
@@ -25,24 +25,28 @@
sipCommander.catalogSubscribe(device, eventResult -> {
ResponseEvent event = (ResponseEvent) eventResult.event;
Element rootElement = null;
- try {
- rootElement = XmlUtil.getRootElement(event.getResponse().getRawContent(), "gb2312");
- } catch (DocumentException e) {
- e.printStackTrace();
- }
- Element resultElement = rootElement.element("Result");
- String result = resultElement.getText();
- if (result.toUpperCase().equals("OK")){
- // 鎴愬姛
- logger.info("鐩綍璁㈤槄鎴愬姛锛� {}", device.getDeviceId());
+ if (event.getResponse().getRawContent() != null) {
+ try {
+ rootElement = XmlUtil.getRootElement(event.getResponse().getRawContent(), "gb2312");
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ Element resultElement = rootElement.element("Result");
+ String result = resultElement.getText();
+ if (result.toUpperCase().equals("OK")){
+ // 鎴愬姛
+ logger.info("[鐩綍璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
+ }else {
+ // 澶辫触
+ logger.info("[鐩綍璁㈤槄]澶辫触锛� {}-{}", device.getDeviceId(), result);
+ }
}else {
- // 澶辫触
- logger.info("鐩綍璁㈤槄澶辫触锛� {}-{}", device.getDeviceId(), result);
+ // 鎴愬姛
+ logger.info("[鐩綍璁㈤槄]鎴愬姛锛� {}", device.getDeviceId());
}
-
},eventResult -> {
// 澶辫触
- logger.warn("鐩綍璁㈤槄澶辫触锛� {}-淇′护鍙戦�佸け璐�", device.getDeviceId());
+ logger.warn("[鐩綍璁㈤槄]澶辫触锛屼俊浠ゅ彂閫佸け璐ワ細 {}-{} ", device.getDeviceId(), eventResult.msg);
});
}
}
--
Gitblit v1.8.0