From 1dcdbc3742835ccab28a8983ae002d2bbdba87eb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 02 三月 2022 12:52:37 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 108 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 28 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 1111ff7..8fed6dd 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
@@ -65,6 +65,25 @@
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);
+ }
/**
* 鍒嗛〉鏌ヨ绾ц仈骞冲彴
@@ -118,6 +137,11 @@
wvpResult.setMsg("missing parameters");
return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
}
+ if (parentPlatform.getServerPort()< 0 || parentPlatform.getServerPort() > 65535){
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("error severPort");
+ return new ResponseEntity<>(wvpResult, HttpStatus.BAD_REQUEST);
+ }
ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
if (parentPlatformOld != null) {
@@ -130,8 +154,16 @@
if (updateResult) {
// 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
if (parentPlatform.isEnable()) {
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
+ 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);
}
@@ -184,10 +216,21 @@
if (updateResult) {
// 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
if (parentPlatform.isEnable()) {
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
+ 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);
}
wvpResult.setCode(0);
wvpResult.setMsg("success");
@@ -282,29 +325,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璋冪敤");
// }
- 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(platformId)) {
+ platformId = null;
}
+ 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;
}
@@ -371,11 +418,11 @@
}
List<PlatformCatalog> platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
// 鏌ヨ涓嬪睘鐨勫浗鏍囬�氶亾
- List<PlatformCatalog> catalogsForChannel = storager.queryChannelInParentPlatformAndCatalog(platformId, parentId);
+// List<PlatformCatalog> catalogsForChannel = storager.queryChannelInParentPlatformAndCatalog(platformId, parentId);
// 鏌ヨ涓嬪睘鐨勭洿鎾祦閫氶亾
- List<PlatformCatalog> catalogsForStream = storager.queryStreamInParentPlatformAndCatalog(platformId, parentId);
- platformCatalogList.addAll(catalogsForChannel);
- platformCatalogList.addAll(catalogsForStream);
+// 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");
@@ -465,25 +512,30 @@
})
@DeleteMapping("/catalog/del")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> delCatalog(String id){
+ public ResponseEntity<WVPResult<String>> delCatalog(String id, String platformId){
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());
- }
- }
+ 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);
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
- result.setCode(0);
+ // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
+ PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);
+
+ // 榛樿鑺傜偣琚Щ闄�
+ if (parentPlatform == null) {
+ storager.setDefaultCatalog(platformId, platformId);
+ result.setData(platformId);
+ }
+
if (delResult > 0) {
result.setMsg("success");
--
Gitblit v1.8.0