From 422ce8aebb1899fa4d3cc50194f35c78817058fb Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 08 一月 2021 11:04:29 +0800
Subject: [PATCH] 完成向上级联->选择通道-001
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 a94685e..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
@@ -1,19 +1,16 @@
package com.genersoft.iot.vmp.vmanager.platform;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.PageResult;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.device.DeviceController;
+import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -28,6 +25,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
private ISIPCommanderForPlatform commanderForPlatform;
@@ -46,7 +46,7 @@
}
@GetMapping("/platforms/{count}/{page}")
- public PageResult<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
+ public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
@@ -76,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 {
@@ -98,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