From 385fdb95f18c1f0b4e38f8a6e481176ac31ee987 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 一月 2022 15:48:08 +0800
Subject: [PATCH] 优化级联选择通道逻辑
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 215 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index c692af4..69ea973 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -1,10 +1,15 @@
package com.genersoft.iot.vmp.vmanager.gb28181.platform;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.CatalogData;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
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.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.UpdateChannelParam;
import com.github.pagehelper.PageInfo;
@@ -20,6 +25,8 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
+
+import java.util.List;
/**
* 绾ц仈骞冲彴绠＄悊
@@ -52,10 +59,10 @@
@GetMapping("/server_config")
public ResponseEntity<JSONObject> serverConfig() {
JSONObject result = new JSONObject();
- result.put("deviceIp", sipConfig.getSipIp());
- result.put("devicePort", sipConfig.getSipPort());
- result.put("username", sipConfig.getSipId());
- result.put("password", sipConfig.getSipPassword());
+ result.put("deviceIp", sipConfig.getIp());
+ result.put("devicePort", sipConfig.getPort());
+ result.put("username", sipConfig.getId());
+ result.put("password", sipConfig.getPassword());
return new ResponseEntity<>(result, HttpStatus.OK);
}
@@ -73,9 +80,9 @@
})
public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
+// }
return storager.queryParentPlatformList(page, count);
}
@@ -119,7 +126,7 @@
// 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
if (parentPlatform.isEnable()) {
// 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform);
+ commanderForPlatform.register(parentPlatform, null, null);
} else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
commanderForPlatform.unregister(parentPlatform, null, null);
}
@@ -187,9 +194,9 @@
@ResponseBody
public ResponseEntity<String> exitPlatform(@PathVariable String serverGBId){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId);
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId);
+// }
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK);
}
@@ -224,9 +231,9 @@
@RequestParam(required = false) Boolean choosed,
@RequestParam(required = false) Boolean channelType){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤");
+// }
PageInfo<ChannelReduce> channelReduces = null;
if (platformId != null ) {
channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, choosed);
@@ -253,7 +260,7 @@
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾API璋冪敤");
}
- int result = storager.updateChannelForGB(param.getPlatformId(), param.getChannelReduces());
+ int result = storager.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
}
@@ -279,5 +286,198 @@
return new ResponseEntity<>(String.valueOf(result > 0), HttpStatus.OK);
}
+ /**
+ * 鑾峰彇鐩綍
+ * @param platformId 骞冲彴ID
+ * @param parentId 鐩綍鐖禝D
+ * @return
+ */
+ @ApiOperation("鑾峰彇鐩綍")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "platformId", value = "骞冲彴ID", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "parentId", value = "鐩綍鐖禝D", dataTypeClass = String.class, required = true),
+ })
+ @GetMapping("/catalog")
+ @ResponseBody
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> getCatalogByPlatform(String platformId, String parentId){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鏌ヨ鐩綍,platformId: {}, parentId: {}", platformId, parentId);
+ }
+ List<PlatformCatalog> platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
+ // 鏌ヨ涓嬪睘鐨勫浗鏍囬�氶亾
+ List<PlatformCatalog> catalogsForChannel = storager.queryChannelInParentPlatformAndCatalog(platformId, parentId);
+ // 鏌ヨ涓嬪睘鐨勭洿鎾祦閫氶亾
+ List<PlatformCatalog> catalogsForStream = storager.queryStreamInParentPlatformAndCatalog(platformId, parentId);
+ platformCatalogList.addAll(catalogsForChannel);
+ platformCatalogList.addAll(catalogsForStream);
+ WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(platformCatalogList);
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+
+ /**
+ * 娣诲姞鐩綍
+ * @param platformCatalog 鐩綍
+ * @return
+ */
+ @ApiOperation("娣诲姞鐩綍")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "platformCatalog", value = "鐩綍淇℃伅", dataTypeClass = PlatformCatalog.class, required = true),
+ })
+ @PostMapping("/catalog/add")
+ @ResponseBody
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> addCatalog(@RequestBody PlatformCatalog platformCatalog){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("娣诲姞鐩綍,{}", JSON.toJSONString(platformCatalog));
+ }
+ PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
+ WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
+
+
+ if (platformCatalogInStore != null) {
+ result.setCode(-1);
+ result.setMsg( platformCatalog.getId() + " already exists");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ int addResult = storager.addCatalog(platformCatalog);
+ if (addResult > 0) {
+ result.setCode(0);
+ result.setMsg("success");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }else {
+ result.setCode(-500);
+ result.setMsg("save error");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ }
+
+ /**
+ * 缂栬緫鐩綍
+ * @param platformCatalog 鐩綍
+ * @return
+ */
+ @ApiOperation("缂栬緫鐩綍")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "platformCatalog", value = "鐩綍淇℃伅", dataTypeClass = PlatformCatalog.class, required = true),
+ })
+ @PostMapping("/catalog/edit")
+ @ResponseBody
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> editCatalog(@RequestBody PlatformCatalog platformCatalog){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("缂栬緫鐩綍,{}", JSON.toJSONString(platformCatalog));
+ }
+ PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
+ WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
+ result.setCode(0);
+
+ if (platformCatalogInStore == null) {
+ result.setMsg( platformCatalog.getId() + " not exists");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ int addResult = storager.updateCatalog(platformCatalog);
+ if (addResult > 0) {
+ result.setMsg("success");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }else {
+ result.setMsg("save error");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鐩綍
+ * @param id 鐩綍Id
+ * @return
+ */
+ @ApiOperation("鍒犻櫎鐩綍")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鐩綍Id", dataTypeClass = String.class, required = true),
+ })
+ @DeleteMapping("/catalog/del")
+ @ResponseBody
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> delCatalog(String id){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鍒犻櫎鐩綍,{}", id);
+ }
+ int delResult = storager.delCatalog(id);
+ WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
+ result.setCode(0);
+
+ if (delResult > 0) {
+ result.setMsg("success");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }else {
+ result.setMsg("save error");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鍏宠仈
+ * @param platformCatalog 鍏宠仈鐨勪俊鎭�
+ * @return
+ */
+ @ApiOperation("鍒犻櫎鍏宠仈")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "platformCatalog", value = "鍏宠仈鐨勪俊鎭�", dataTypeClass = PlatformCatalog.class, required = true),
+ })
+ @DeleteMapping("/catalog/relation/del")
+ @ResponseBody
+ public ResponseEntity<WVPResult<List<PlatformCatalog>>> delRelation(@RequestBody PlatformCatalog platformCatalog){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("鍒犻櫎鍏宠仈,{}", JSON.toJSONString(platformCatalog));
+ }
+ int delResult = storager.delRelation(platformCatalog);
+ WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
+ result.setCode(0);
+
+ if (delResult > 0) {
+ result.setMsg("success");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }else {
+ result.setMsg("save error");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ }
+
+
+ /**
+ * 淇敼榛樿鐩綍
+ * @param platformId 骞冲彴Id
+ * @param catalogId 鐩綍Id
+ * @return
+ */
+ @ApiOperation("淇敼榛樿鐩綍")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "platformId", value = "骞冲彴Id", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "catalogId", value = "鐩綍Id", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/catalog/default/update")
+ @ResponseBody
+ public ResponseEntity<WVPResult<String>> setDefaultCatalog(String platformId, String catalogId){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("淇敼榛樿鐩綍,{},{}", platformId, catalogId);
+ }
+ int updateResult = storager.setDefaultCatalog(platformId, catalogId);
+ WVPResult<String> result = new WVPResult<>();
+ result.setCode(0);
+
+ if (updateResult > 0) {
+ result.setMsg("success");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }else {
+ result.setMsg("save error");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+ }
+
}
--
Gitblit v1.8.0