From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
index b69bf68..7760bdd 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
@@ -2,11 +2,13 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
+import com.genersoft.iot.vmp.service.IPlatformService;
+import com.genersoft.iot.vmp.service.impl.PlatformServiceImpl;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
@@ -16,53 +18,55 @@
/**
* 绯荤粺鍚姩鏃舵帶鍒朵笂绾у钩鍙伴噸鏂版敞鍐�
+ * @author lin
*/
@Component
-@Order(value=3)
+@Order(value=13)
public class SipPlatformRunner implements CommandLineRunner {
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private EventPublisher publisher;
+ private IPlatformService platformService;
@Autowired
private ISIPCommanderForPlatform sipCommanderForPlatform;
+ private final static Logger logger = LoggerFactory.getLogger(PlatformServiceImpl.class);
@Override
public void run(String... args) throws Exception {
- // 璁剧疆鎵�鏈夊钩鍙扮绾�
- storager.outlineForAllParentPlatform();
-
- // 娓呯悊鎵�鏈夊钩鍙版敞鍐岀紦瀛�
- redisCatchStorage.cleanPlatformRegisterInfos();
-
- // 鍋滄鎵�鏈夋帹娴�
-// zlmrtpServerFactory.closeAllSendRtpStream();
-
+ // 鑾峰彇鎵�鏈夊惎鐢ㄧ殑骞冲彴
List<ParentPlatform> parentPlatforms = storager.queryEnableParentPlatformList(true);
for (ParentPlatform parentPlatform : parentPlatforms) {
- redisCatchStorage.updatePlatformRegister(parentPlatform);
- redisCatchStorage.updatePlatformKeepalive(parentPlatform);
+ ParentPlatformCatch parentPlatformCatchOld = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId());
+ // 鏇存柊缂撳瓨
ParentPlatformCatch parentPlatformCatch = new ParentPlatformCatch();
-
parentPlatformCatch.setParentPlatform(parentPlatform);
parentPlatformCatch.setId(parentPlatform.getServerGBId());
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
+ if (parentPlatformCatchOld != null) {
+ // 鍙栨秷璁㈤槄
+ try {
+ sipCommanderForPlatform.unregister(parentPlatform, parentPlatformCatchOld.getSipTransactionInfo(), null, (eventResult)->{
+ platformService.login(parentPlatform);
+ });
+ } catch (Exception e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ platformService.offline(parentPlatform, true);
+ continue;
+ }
+ }
- // 鍙栨秷璁㈤槄
- sipCommanderForPlatform.unregister(parentPlatform, null, null);
- Thread.sleep(500);
- // 鍙戦�佸钩鍙版湭娉ㄥ唽娑堟伅
- publisher.platformNotRegisterEventPublish(parentPlatform.getServerGBId());
+ // 璁剧疆鎵�鏈夊钩鍙扮绾�
+ platformService.offline(parentPlatform, false);
}
}
}
--
Gitblit v1.8.0