From 7fb07848aba756f714070b3236537fb6d4df2035 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Thu, 2 Jan 2025 17:33:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E7=BE=A4-=E8=87=AA=E5=8A=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=BF=87=E5=9B=BD=E6=A0=87=E7=BA=A7=E8=81=94]=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PlatformServiceImpl.java     | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java
index ec931b64..0a37d96a 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java
@@ -121,37 +121,36 @@ public class PlatformServiceImpl implements IPlatformService {
             ServerInfo serverInfo = redisCatchStorage.queryServerInfo(serverId);
             if (serverInfo != null) {
                 return;
-            }else {
-                log.info("[集群] 检测到 {} 已离线", serverId);
-                String chooseServerId = redisCatchStorage.chooseOneServer(serverId);
-                if (!userSetting.getServerId().equals(chooseServerId)){
-                    return;
-                }
-                // 此平台需要选择新平台处理， 确定由当前平台即开始处理
-                List<Platform> platformList = platformMapper.queryByServerId(serverId);
-                platformList.forEach(platform -> {
-                    log.info("[集群] 由本平台开启上级平台{}({})的注册", platform.getName(), platform.getServerGBId());
-                    // 设置平台使用当前平台的IP
-                    platform.setAddress(getIpWithSameNetwork(platform.getAddress()));
-                    platform.setServerId(userSetting.getServerId());
-                    platformMapper.update(platform);
-                    // 更新redis
-                    redisCatchStorage.delPlatformCatchInfo(platform.getServerGBId());
-                    PlatformCatch platformCatch = new PlatformCatch();
-                    platformCatch.setPlatform(platform);
-                    platformCatch.setId(platform.getServerGBId());
-                    redisCatchStorage.updatePlatformCatchInfo(platformCatch);
-                    // 开始注册
-                    // 注册成功时由程序直接调用了online方法
-                    try {
-                        commanderForPlatform.register(platform, eventResult -> {
-                            log.info("[国标级联] {}（{}）,添加向上级注册失败，请确定上级平台可用时重新保存", platform.getName(), platform.getServerGBId());
-                        }, null);
-                    } catch (InvalidArgumentException | ParseException | SipException e) {
-                        log.error("[命令发送失败] 国标级联: {}", e.getMessage());
-                    }
-                });
             }
+            log.info("[集群] 检测到 {} 已离线", serverId);
+            String chooseServerId = redisCatchStorage.chooseOneServer(serverId);
+            if (!userSetting.getServerId().equals(chooseServerId)){
+                return;
+            }
+            // 此平台需要选择新平台处理， 确定由当前平台即开始处理
+            List<Platform> platformList = platformMapper.queryByServerId(serverId);
+            platformList.forEach(platform -> {
+                log.info("[集群] 由本平台开启上级平台{}({})的注册", platform.getName(), platform.getServerGBId());
+                // 设置平台使用当前平台的IP
+                platform.setAddress(getIpWithSameNetwork(platform.getAddress()));
+                platform.setServerId(userSetting.getServerId());
+                platformMapper.update(platform);
+                // 更新redis
+                redisCatchStorage.delPlatformCatchInfo(platform.getServerGBId());
+                PlatformCatch platformCatch = new PlatformCatch();
+                platformCatch.setPlatform(platform);
+                platformCatch.setId(platform.getServerGBId());
+                redisCatchStorage.updatePlatformCatchInfo(platformCatch);
+                // 开始注册
+                // 注册成功时由程序直接调用了online方法
+                try {
+                    commanderForPlatform.register(platform, eventResult -> {
+                        log.info("[国标级联] {}（{}）,添加向上级注册失败，请确定上级平台可用时重新保存", platform.getName(), platform.getServerGBId());
+                    }, null);
+                } catch (InvalidArgumentException | ParseException | SipException e) {
+                    log.error("[命令发送失败] 国标级联: {}", e.getMessage());
+                }
+            });
         });
     }