From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 103 ++++++++++++++++++++++++++-------------------------
1 files changed, 53 insertions(+), 50 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 14b7a37..a1cb871 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
@@ -9,14 +9,13 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
-import com.genersoft.iot.vmp.gb28181.bean.TreeType;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.service.IPlatformChannelService;
+import com.genersoft.iot.vmp.service.IPlatformService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
-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;
@@ -26,13 +25,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import com.genersoft.iot.vmp.conf.SipConfig;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
import java.util.List;
/**
@@ -70,6 +69,9 @@
@Autowired
private DynamicTask dynamicTask;
+ @Autowired
+ private IPlatformService platformService;
+
/**
* 鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�
*
@@ -95,8 +97,7 @@
@Parameter(name = "id", description = "骞冲彴鍥芥爣缂栧彿", required = true)
@GetMapping("/info/{id}")
public ParentPlatform getPlatform(@PathVariable String id) {
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(id);
- WVPResult<ParentPlatform> wvpResult = new WVPResult<>();
+ ParentPlatform parentPlatform = platformService.queryPlatformByServerGBId(id);
if (parentPlatform != null) {
return parentPlatform;
} else {
@@ -117,7 +118,7 @@
@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
public PageInfo<ParentPlatform> platforms(@PathVariable int page, @PathVariable int count) {
- PageInfo<ParentPlatform> parentPlatformPageInfo = storager.queryParentPlatformList(page, count);
+ PageInfo<ParentPlatform> parentPlatformPageInfo = platformService.queryParentPlatformList(page, count);
if (parentPlatformPageInfo.getList().size() > 0) {
for (ParentPlatform platform : parentPlatformPageInfo.getList()) {
platform.setMobilePositionSubscribe(subscribeHolder.getMobilePositionSubscribe(platform.getServerGBId()) != null);
@@ -136,7 +137,7 @@
@Operation(summary = "娣诲姞涓婄骇骞冲彴淇℃伅")
@PostMapping("/add")
@ResponseBody
- public String addPlatform(@RequestBody ParentPlatform parentPlatform) {
+ public void addPlatform(@RequestBody ParentPlatform parentPlatform) {
if (logger.isDebugEnabled()) {
logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
@@ -158,32 +159,16 @@
throw new ControllerException(ErrorCode.ERROR400.getCode(), "error severPort");
}
+
ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
if (parentPlatformOld != null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴 " + parentPlatform.getServerGBId() + " 宸插瓨鍦�");
}
parentPlatform.setCreateTime(DateUtil.getNow());
parentPlatform.setUpdateTime(DateUtil.getNow());
- boolean updateResult = storager.updateParentPlatform(parentPlatform);
+ boolean updateResult = platformService.add(parentPlatform);
- if (updateResult) {
- // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
- if (parentPlatform.isEnable()) {
- if (parentPlatformOld != null && 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);
- }
- return null;
- } else {
+ if (!updateResult) {
throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
}
}
@@ -197,7 +182,7 @@
@Operation(summary = "淇濆瓨涓婄骇骞冲彴淇℃伅")
@PostMapping("/save")
@ResponseBody
- public String savePlatform(@RequestBody ParentPlatform parentPlatform) {
+ public void savePlatform(@RequestBody ParentPlatform parentPlatform) {
if (logger.isDebugEnabled()) {
logger.debug("淇濆瓨涓婄骇骞冲彴淇℃伅API璋冪敤");
@@ -230,24 +215,40 @@
// 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
if (parentPlatform.isEnable()) {
if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
try {
Thread.sleep(500);
} catch (InterruptedException e) {
- e.printStackTrace();
+ logger.error("[绾跨▼浼戠湢澶辫触] : {}", e.getMessage());
}
// 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
+ try {
+ commanderForPlatform.register(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
+ }
+
} else {
// 鍙淇濆瓨灏卞彂閫佹敞鍐�
- commanderForPlatform.register(parentPlatform, null, null);
+ try {
+ commanderForPlatform.register(parentPlatform, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
+ }
}
} else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 鍏抽棴鍚敤鏃舵敞閿�
- commanderForPlatform.unregister(parentPlatformOld, null, null);
+ try {
+ commanderForPlatform.unregister(parentPlatformOld, null, null);
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
// 鍋滄璁㈤槄鐩稿叧鐨勫畾鏃朵换鍔�
subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
}
- return null;
} else {
throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
}
@@ -263,7 +264,7 @@
@Parameter(name = "serverGBId", description = "涓婄骇骞冲彴鐨勫浗鏍囩紪鍙�")
@DeleteMapping("/delete/{serverGBId}")
@ResponseBody
- public String deletePlatform(@PathVariable String serverGBId) {
+ public void deletePlatform(@PathVariable String serverGBId) {
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎涓婄骇骞冲彴API璋冪敤");
@@ -277,17 +278,21 @@
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
}
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
- commanderForPlatform.unregister(parentPlatform, (event -> {
- // 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
- }), (event -> {
- // 娓呯┖redis缂撳瓨
- redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
- redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
- }));
+ try {
+ commanderForPlatform.unregister(parentPlatform, (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }), (event -> {
+ // 娓呯┖redis缂撳瓨
+ redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+ redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
+ }));
+ } catch (InvalidArgumentException | ParseException | SipException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
+ }
boolean deleteResult = storager.deleteParentPlatform(parentPlatform);
storager.delCatalogByPlatformId(parentPlatform.getServerGBId());
@@ -297,9 +302,7 @@
dynamicTask.stop(key);
// 鍒犻櫎缂撳瓨鐨勮闃呬俊鎭�
subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
- if (deleteResult) {
- return null;
- } else {
+ if (!deleteResult) {
throw new ControllerException(ErrorCode.ERROR100);
}
}
--
Gitblit v1.8.0