From 54d79531795d43bf45fa8d7cb2ed2d072f7f5ccd Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 13:15:39 +0800
Subject: [PATCH] 完成向上级联->删除的时候注销
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 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..152fa5d 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,8 @@
@Autowired
private IVideoManagerStorager storager;
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
private ISIPCommanderForPlatform commanderForPlatform;
@@ -46,7 +45,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璋冪敤");
@@ -79,7 +78,7 @@
boolean updateResult = storager.updateParentPlatform(parentPlatform);
if (updateResult) {
- commanderForPlatform.register(parentPlatform, null, null, null, null);
+ commanderForPlatform.register(parentPlatform);
return new ResponseEntity<>("success", HttpStatus.OK);
}else {
@@ -98,7 +97,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