From 1dbb559b388831b5f15e690d0b33d24b1faaa983 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 25 一月 2022 15:43:52 +0800
Subject: [PATCH] 优化文件导入判断
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 296 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 286 insertions(+), 10 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 5af0837..1111ff7 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;
/**
* 绾ц仈骞冲彴绠＄悊
@@ -80,21 +87,22 @@
}
/**
- * 淇濆瓨涓婄骇骞冲彴淇℃伅
+ * 娣诲姞涓婄骇骞冲彴淇℃伅
* @param parentPlatform
* @return
*/
- @ApiOperation("淇濆瓨涓婄骇骞冲彴淇℃伅")
+ @ApiOperation("娣诲姞涓婄骇骞冲彴淇℃伅")
@ApiImplicitParams({
@ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class),
})
- @PostMapping("/save")
+ @PostMapping("/add")
@ResponseBody
- public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){
+ public ResponseEntity<WVPResult<String>> addPlatform(@RequestBody ParentPlatform parentPlatform){
if (logger.isDebugEnabled()) {
logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
}
+ WVPResult<String> wvpResult = new WVPResult<>();
if (StringUtils.isEmpty(parentPlatform.getName())
||StringUtils.isEmpty(parentPlatform.getServerGBId())
||StringUtils.isEmpty(parentPlatform.getServerGBDomain())
@@ -106,11 +114,69 @@
||StringUtils.isEmpty(parentPlatform.getTransport())
||StringUtils.isEmpty(parentPlatform.getCharacterSet())
){
- return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("missing parameters");
+ return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
}
- // TODO 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦�,涓旀敞鍐屾垚鍔�, 濡傛灉娉ㄥ唽鎴愬姛,闇�瑕佸厛娉ㄩ攢涔嬪墠鍐�,淇敼骞舵敞鍐�
- // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
+ ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
+ if (parentPlatformOld != null) {
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("骞冲彴 "+parentPlatform.getServerGBId()+" 宸插瓨鍦�");
+ return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ }
+ boolean updateResult = storager.updateParentPlatform(parentPlatform);
+
+ if (updateResult) {
+ // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
+ if (parentPlatform.isEnable()) {
+ // 鍙淇濆瓨灏卞彂閫佹敞鍐�
+ commanderForPlatform.register(parentPlatform, null, null);
+ } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
+ commanderForPlatform.unregister(parentPlatform, null, null);
+ }
+ wvpResult.setCode(0);
+ wvpResult.setMsg("success");
+ return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ } else {
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("鍐欏叆鏁版嵁搴撳け璐�");
+ return new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ }
+ }
+
+ /**
+ * 淇濆瓨涓婄骇骞冲彴淇℃伅
+ * @param parentPlatform
+ * @return
+ */
+ @ApiOperation("淇濆瓨涓婄骇骞冲彴淇℃伅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class),
+ })
+ @PostMapping("/save")
+ @ResponseBody
+ public ResponseEntity<WVPResult<String>> savePlatform(@RequestBody ParentPlatform parentPlatform){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
+ }
+ WVPResult<String> wvpResult = new WVPResult<>();
+ if (StringUtils.isEmpty(parentPlatform.getName())
+ ||StringUtils.isEmpty(parentPlatform.getServerGBId())
+ ||StringUtils.isEmpty(parentPlatform.getServerGBDomain())
+ ||StringUtils.isEmpty(parentPlatform.getServerIP())
+ ||StringUtils.isEmpty(parentPlatform.getServerPort())
+ ||StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+ ||StringUtils.isEmpty(parentPlatform.getExpires())
+ ||StringUtils.isEmpty(parentPlatform.getKeepTimeout())
+ ||StringUtils.isEmpty(parentPlatform.getTransport())
+ ||StringUtils.isEmpty(parentPlatform.getCharacterSet())
+ ){
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("missing parameters");
+ return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
+ }
ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
boolean updateResult = storager.updateParentPlatform(parentPlatform);
@@ -123,9 +189,13 @@
} else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿�
commanderForPlatform.unregister(parentPlatform, null, null);
}
- return new ResponseEntity<>("success", HttpStatus.OK);
+ wvpResult.setCode(0);
+ wvpResult.setMsg("success");
+ return new ResponseEntity<>(wvpResult, HttpStatus.OK);
} else {
- return new ResponseEntity<>("fail", HttpStatus.OK);
+ wvpResult.setCode(0);
+ wvpResult.setMsg("鍐欏叆鏁版嵁搴撳け璐�");
+ return new ResponseEntity<>(wvpResult, HttpStatus.OK);
}
}
@@ -165,6 +235,8 @@
}));
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
+ storager.delCatalogByPlatformId(parentPlatform.getServerGBId());
+ storager.delRelationByPlatformId(parentPlatform.getServerGBId());
if (deleteResult) {
@@ -253,7 +325,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 +351,209 @@
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);
+ }
+ // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
+ PlatformCatalog catalog = storager.getCatalog(id);
+ if (catalog != null) {
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(catalog.getPlatformId());
+ if (parentPlatform != null) {
+ if (id.equals(parentPlatform.getCatalogId())) {
+ storager.setDefaultCatalog(parentPlatform.getServerGBId(), parentPlatform.getServerGBId());
+ }
+ }
+ }
+
+ 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