From ac1a4a027a7bd88efb32e9da666bdba4b5fa166f Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 14 一月 2022 17:04:26 +0800 Subject: [PATCH] 支持国标级联的目录订阅功能 --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 200 insertions(+), 1 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..0dc172f 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; /** * 绾ц仈骞冲彴绠$悊 @@ -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,197 @@ 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