From 4c66f6b29eda2d459aed86f7a138438191de7e47 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 17:35:32 +0800
Subject: [PATCH] 优化消息处理中存在可能异常的处理流程
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
index 82f4a25..9e79f3f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
@@ -67,33 +67,37 @@
try {
// 鍥炲200 OK
responseAck(getServerTransaction(evt), Response.OK);
- Element snElement = rootElement.element("SN");
- String sn = snElement.getText();
- // 鍑嗗鍥炲閫氶亾淇℃伅
- List<DeviceChannel> deviceChannelInPlatforms = storager.queryChannelWithCatalog(parentPlatform.getServerGBId());
- // 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
- List<DeviceChannel> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
- // 鍥炲鐩綍淇℃伅
- List<DeviceChannel> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ鍥炲200OK: {}", e.getMessage());
+ }
+ Element snElement = rootElement.element("SN");
+ String sn = snElement.getText();
+ // 鍑嗗鍥炲閫氶亾淇℃伅
+ List<DeviceChannel> deviceChannelInPlatforms = storager.queryChannelWithCatalog(parentPlatform.getServerGBId());
+ // 鏌ヨ鍏宠仈鐨勭洿鎾�氶亾
+ List<DeviceChannel> gbStreams = storager.queryGbStreamListInPlatform(parentPlatform.getServerGBId());
+ // 鍥炲鐩綍淇℃伅
+ List<DeviceChannel> catalogs = storager.queryCatalogInPlatform(parentPlatform.getServerGBId());
- List<DeviceChannel> allChannels = new ArrayList<>();
+ List<DeviceChannel> allChannels = new ArrayList<>();
- // 鍥炲骞冲彴
+ // 鍥炲骞冲彴
// DeviceChannel deviceChannel = getChannelForPlatform(parentPlatform);
// allChannels.add(deviceChannel);
- // 鍥炲鐩綍
- if (catalogs.size() > 0) {
- allChannels.addAll(catalogs);
- }
- // 鍥炲绾ц仈鐨勯�氶亾
- if (deviceChannelInPlatforms.size() > 0) {
- allChannels.addAll(deviceChannelInPlatforms);
- }
- // 鍥炲鐩存挱鐨勯�氶亾
- if (gbStreams.size() > 0) {
- allChannels.addAll(gbStreams);
- }
+ // 鍥炲鐩綍
+ if (catalogs.size() > 0) {
+ allChannels.addAll(catalogs);
+ }
+ // 鍥炲绾ц仈鐨勯�氶亾
+ if (deviceChannelInPlatforms.size() > 0) {
+ allChannels.addAll(deviceChannelInPlatforms);
+ }
+ // 鍥炲鐩存挱鐨勯�氶亾
+ if (gbStreams.size() > 0) {
+ allChannels.addAll(gbStreams);
+ }
+ try {
if (allChannels.size() > 0) {
cmderFroPlatform.catalogQuery(allChannels, parentPlatform, sn, fromHeader.getTag());
}else {
@@ -101,9 +105,11 @@
cmderFroPlatform.catalogQuery(null, parentPlatform, sn, fromHeader.getTag(), 0);
}
} catch (SipException | InvalidArgumentException | ParseException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ: {}", e.getMessage());
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鐩綍鏌ヨ鍥炲: {}", e.getMessage());
}
+
+
}
private DeviceChannel getChannelForPlatform(ParentPlatform platform) {
--
Gitblit v1.8.0