From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法

---
 src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 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 eae4547..cf16f86 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
@@ -5,7 +5,7 @@
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
@@ -21,7 +21,7 @@
 public class SipPlatformRunner implements CommandLineRunner {
 
     @Autowired
-    private IVideoManagerStorager storager;
+    private IVideoManagerStorage storager;
 
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
@@ -29,15 +29,24 @@
     @Autowired
     private EventPublisher publisher;
 
+    @Autowired
+    private ISIPCommanderForPlatform sipCommanderForPlatform;
+
+
     @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);
@@ -45,11 +54,14 @@
             ParentPlatformCatch parentPlatformCatch = new ParentPlatformCatch();
 
             parentPlatformCatch.setParentPlatform(parentPlatform);
-            parentPlatformCatch.setId(parentPlatform.getDeviceGBId());
+            parentPlatformCatch.setId(parentPlatform.getServerGBId());
             redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
 
-            // 鍙戦�佸钩鍙版湭娉ㄥ唽娑堟伅
-            publisher.platformNotRegisterEventPublish(parentPlatform.getDeviceGBId());
+            // 鍙栨秷璁㈤槄
+            sipCommanderForPlatform.unregister(parentPlatform, null, (eventResult)->{
+                // 鍙戦�佸钩鍙版湭娉ㄥ唽娑堟伅
+                publisher.platformNotRegisterEventPublish(parentPlatform.getServerGBId());
+            });
         }
     }
 }

--
Gitblit v1.8.0