From 9bf87971e7dc6e0bccc0cf9a2301e9c89f9a0ba6 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 14:56:10 +0800
Subject: [PATCH] 完成向上级联->启动时自动注册
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
index a1d3ba2..ee77f01 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
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.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -24,6 +25,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
private ISIPCommanderForPlatform commanderForPlatform;
@@ -72,10 +76,19 @@
}
// TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
+ ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+
boolean updateResult = storager.updateParentPlatform(parentPlatform);
if (updateResult) {
- commanderForPlatform.register(parentPlatform, null, null, null, null);
+ // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
+ if (parentPlatform.isEnable()) {
+ // 鍙淇濆瓨灏卞彂閫佹敞鍐�
+ commanderForPlatform.register(parentPlatform);
+ }else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
+ commanderForPlatform.unregister(parentPlatform, null, null);
+ }
+
return new ResponseEntity<>("success", HttpStatus.OK);
}else {
@@ -94,7 +107,23 @@
){
return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
}
+
+ // 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
+ commanderForPlatform.unregister(parentPlatform, (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ }), (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ }));
+
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
+
+
if (deleteResult) {
return new ResponseEntity<>("success", HttpStatus.OK);
}else {
--
Gitblit v1.8.0