From 56859d09df8d4226882d43934acf32d60a3b51d7 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 30 三月 2021 18:46:34 +0800
Subject: [PATCH] 添加推流列表和拉流代理，下一步与国标关联
---
src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 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 031fb09..279a031 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,6 +1,5 @@
package com.genersoft.iot.vmp.vmanager.platform;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
@@ -17,10 +16,6 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
-
-import java.util.List;
-import java.util.Map;
-
@CrossOrigin
@RestController
@@ -65,7 +60,7 @@
public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){
if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+ logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
}
if (StringUtils.isEmpty(parentPlatform.getName())
||StringUtils.isEmpty(parentPlatform.getServerGBId())
@@ -92,13 +87,13 @@
if (parentPlatform.isEnable()) {
// 鍙淇濆瓨灏卞彂閫佹敞鍐�
commanderForPlatform.register(parentPlatform);
- }else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
+ } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
commanderForPlatform.unregister(parentPlatform, null, null);
}
-
+
return new ResponseEntity<>("success", HttpStatus.OK);
- }else {
+ } else {
return new ResponseEntity<>("fail", HttpStatus.OK);
}
}
@@ -108,9 +103,9 @@
public ResponseEntity<String> deletePlatform(@RequestBody ParentPlatform parentPlatform){
if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+ logger.debug("鍒犻櫎涓婄骇骞冲彴API璋冪敤");
}
- if (StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+ if (StringUtils.isEmpty(parentPlatform.getServerGBId())
){
return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
}
@@ -118,14 +113,14 @@
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
commanderForPlatform.unregister(parentPlatform, (event -> {
// 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
}), (event -> {
// 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
}));
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
@@ -143,7 +138,7 @@
public ResponseEntity<String> exitPlatform(@PathVariable String deviceGbId){
if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+ logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + deviceGbId);
}
ParentPlatform parentPlatform = storager.queryParentPlatById(deviceGbId);
return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
@@ -189,7 +184,7 @@
public ResponseEntity<String> delChannelForGB(@RequestBody UpdateChannelParam param){
if (logger.isDebugEnabled()) {
- logger.debug("缁欎笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾API璋冪敤");
+ logger.debug("缁欎笂绾у钩鍙板垹闄ゅ浗鏍囬�氶亾API璋冪敤");
}
int result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
--
Gitblit v1.8.0