From d6fe626b1cea8d206a4b9679c07d555e3de2ea9a Mon Sep 17 00:00:00 2001
From: ljm <1271952916@qq.com>
Date: 星期六, 22 十月 2022 09:48:45 +0800
Subject: [PATCH] 【zlm心跳hook】重复查询redis了 变量也不需要多次定义 数据库有的话应该恢复zlm 缓存没有的话需要重新加载缓存
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index fa1de00..a1cb871 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -29,6 +29,9 @@
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.util.List;
/**
@@ -212,20 +215,37 @@
// 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
if (parentPlatform.isEnable()) {
if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- e.printStackTrace();
+ logger.error("[绾跨▼浼戠湢澶辫触] : {}", e.getMessage());
}
// 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
+ try {
+ commanderForPlatform.register(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
+ }
+
} else {
// 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
+ try {
+ commanderForPlatform.register(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
+ }
}
} else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 鍏抽棴鍚敤鏃舵敞閿�
- commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
// 鍋滄璁㈤槄鐩稿叧鐨勫畾鏃朵换鍔�
subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
}
@@ -258,17 +278,21 @@
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
}
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
- commanderForPlatform.unregister(parentPlatform, (event -> {
- // 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
- }), (event -> {
- // 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
- }));
+ try {
+ commanderForPlatform.unregister(parentPlatform, (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }), (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }));
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
storager.delCatalogByPlatformId(parentPlatform.getServerGBId());
--
Gitblit v1.8.0