From b10a65483d709838fbe7d871b83fd5d42f2ef37e Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 04 三月 2022 10:30:55 +0800 Subject: [PATCH] 去除lombok,readme更新 --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 391 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 356 insertions(+), 35 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 ce476f7..78b5d53 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,11 +59,30 @@ @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); + } + /** + * 鑾峰彇绾ц仈鏈嶅姟鍣ㄤ俊鎭� + * @return + */ + @ApiOperation("鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�") + @GetMapping("/info/{id}") + public ResponseEntity<WVPResult<ParentPlatform>> getPlatform(@PathVariable String id) { + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(id); + WVPResult<ParentPlatform> wvpResult = new WVPResult<>(); + if (parentPlatform != null) { + wvpResult.setCode(0); + wvpResult.setMsg("success"); + wvpResult.setData(parentPlatform); + }else { + wvpResult.setCode(-1); + wvpResult.setMsg("鏈煡璇㈠埌姝ゅ钩鍙�"); + } + return new ResponseEntity<>(wvpResult, HttpStatus.OK); } /** @@ -73,10 +99,77 @@ }) 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); + } + + /** + * 娣诲姞涓婄骇骞冲彴淇℃伅 + * @param parentPlatform + * @return + */ + @ApiOperation("娣诲姞涓婄骇骞冲彴淇℃伅") + @ApiImplicitParams({ + @ApiImplicitParam(name = "parentPlatform", value = "涓婄骇骞冲彴淇℃伅", dataTypeClass = ParentPlatform.class), + }) + @PostMapping("/add") + @ResponseBody + 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()) + ||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()); + 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()) { + if (parentPlatformOld.isStatus()) { + commanderForPlatform.unregister(parentPlatformOld, null, eventResult -> { + // 鍙淇濆瓨灏卞彂閫佹敞鍐� + commanderForPlatform.register(parentPlatform, null, null); + }); + }else { + // 鍙淇濆瓨灏卞彂閫佹敞鍐� + 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); + } } /** @@ -90,11 +183,12 @@ }) @PostMapping("/save") @ResponseBody - public ResponseEntity<String> savePlatform(@RequestBody ParentPlatform parentPlatform){ + 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()) @@ -106,28 +200,40 @@ ||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.queryParentPlatById(parentPlatform.getServerGBId()); + ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId()); boolean updateResult = storager.updateParentPlatform(parentPlatform); if (updateResult) { // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐� if (parentPlatform.isEnable()) { - // 鍙淇濆瓨灏卞彂閫佹敞鍐� - commanderForPlatform.register(parentPlatform); + if (parentPlatformOld.isStatus()) { + commanderForPlatform.unregister(parentPlatformOld, null, null); + try { + Thread.sleep(500); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // 鍙淇濆瓨灏卞彂閫佹敞鍐� + commanderForPlatform.register(parentPlatform, null, null); + }else { + // 鍙淇濆瓨灏卞彂閫佹敞鍐� + commanderForPlatform.register(parentPlatform, null, null); + } } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()){ // 鍏抽棴鍚敤鏃舵敞閿� - commanderForPlatform.unregister(parentPlatform, null, null); + commanderForPlatform.unregister(parentPlatformOld, 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); } } @@ -151,7 +257,7 @@ ){ return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST); } - ParentPlatform parentPlatform = storager.queryParentPlatById(serverGBId); + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId); if (parentPlatform == null) return new ResponseEntity<>("fail", HttpStatus.OK); // 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛� commanderForPlatform.unregister(parentPlatform, (event -> { @@ -167,6 +273,8 @@ })); boolean deleteResult = storager.deleteParentPlatform(parentPlatform); + storager.delCatalogByPlatformId(parentPlatform.getServerGBId()); + storager.delRelationByPlatformId(parentPlatform.getServerGBId()); if (deleteResult) { @@ -189,10 +297,10 @@ @ResponseBody public ResponseEntity<String> exitPlatform(@PathVariable String serverGBId){ - if (logger.isDebugEnabled()) { - logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId); - } - ParentPlatform parentPlatform = storager.queryParentPlatById(serverGBId); +// if (logger.isDebugEnabled()) { +// logger.debug("鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪API璋冪敤锛�" + serverGBId); +// } + ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId); return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK); } @@ -212,29 +320,33 @@ @ApiImplicitParam(name = "page", value = "褰撳墠椤�", dataTypeClass = Integer.class), @ApiImplicitParam(name = "count", value = "姣忛〉鏉℃暟", dataTypeClass = Integer.class), @ApiImplicitParam(name = "platformId", value = "涓婄骇骞冲彴ID", dataTypeClass = String.class), + @ApiImplicitParam(name = "catalogId", value = "鐩綍ID", dataTypeClass = String.class), @ApiImplicitParam(name = "query", value = "鏌ヨ鍐呭", dataTypeClass = String.class), @ApiImplicitParam(name = "online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class), - @ApiImplicitParam(name = "choosed", value = "鏄惁宸查�変腑", dataTypeClass = Boolean.class), @ApiImplicitParam(name = "channelType", value = "閫氶亾绫诲瀷", dataTypeClass = Boolean.class), }) @GetMapping("/channel_list") @ResponseBody public PageInfo<ChannelReduce> channelList(int page, int count, @RequestParam(required = false) String platformId, + @RequestParam(required = false) String catalogId, @RequestParam(required = false) String query, @RequestParam(required = false) Boolean online, - @RequestParam(required = false) Boolean choosed, @RequestParam(required = false) Boolean channelType){ - if (logger.isDebugEnabled()) { - logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤"); +// if (logger.isDebugEnabled()) { +// logger.debug("鏌ヨ鎵�鏈夋墍鏈夐�氶亾API璋冪敤"); +// } + if(StringUtils.isEmpty(platformId)) { + platformId = null; } - PageInfo<ChannelReduce> channelReduces = null; - if (platformId != null ) { - channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, choosed); - }else { - channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, null, false); + if(StringUtils.isEmpty(query)) { + query = null; } + if(StringUtils.isEmpty(platformId) || StringUtils.isEmpty(catalogId)) { + catalogId = null; + } + PageInfo<ChannelReduce> channelReduces = storager.queryAllChannelList(page, count, query, online, channelType, platformId, catalogId); return channelReduces; } @@ -255,7 +367,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); } @@ -281,5 +393,214 @@ 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<String>> delCatalog(String id, String platformId){ + + if (logger.isDebugEnabled()) { + logger.debug("鍒犻櫎鐩綍,{}", id); + } + WVPResult<String> result = new WVPResult<>(); + + if (StringUtils.isEmpty(id) || StringUtils.isEmpty(platformId)) { + result.setCode(-1); + result.setMsg("param error"); + return new ResponseEntity<>(result, HttpStatus.BAD_REQUEST); + } + result.setCode(0); + + int delResult = storager.delCatalog(id); + // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰� + PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId); + + // 榛樿鑺傜偣琚Щ闄� + if (parentPlatform == null) { + storager.setDefaultCatalog(platformId, platformId); + result.setData(platformId); + } + + + 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