From 71030ca6bc2a4a2eb05f4b63fa83dda5e89ac68b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 四月 2023 17:50:33 +0800
Subject: [PATCH] 更新readme
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 92 +++++++++++++++++-----------------------------
1 files changed, 34 insertions(+), 58 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 3bd8aec..1b2a8f3 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
@@ -7,11 +7,11 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
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.service.*;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
@@ -38,7 +38,7 @@
* 绾ц仈骞冲彴绠＄悊
*/
@Tag(name = "绾ц仈骞冲彴绠＄悊")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/platform")
public class PlatformController {
@@ -71,6 +71,12 @@
@Autowired
private IPlatformService platformService;
+
+ @Autowired
+ private IDeviceChannelService deviceChannelService;
+
+ @Autowired
+ private IGbStreamService gbStreamService;
/**
* 鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�
@@ -200,58 +206,8 @@
) {
throw new ControllerException(ErrorCode.ERROR400);
}
- parentPlatform.setCharacterSet(parentPlatform.getCharacterSet().toUpperCase());
- ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());
- parentPlatform.setUpdateTime(DateUtil.getNow());
- if (!parentPlatformOld.getTreeType().equals(parentPlatform.getTreeType())) {
- // 鐩綍缁撴瀯鍙戠敓鍙樺寲锛屾竻绌轰箣鍓嶇殑鍏宠仈鍏崇郴
- logger.info("淇濆瓨骞冲彴{}鏃跺彂鐜扮洰褰曠粨鏋勫彉鍖栵紝娓呯┖鍏宠仈鍏崇郴", parentPlatform.getDeviceGBId());
- storager.cleanContentForPlatform(parentPlatform.getServerGBId());
- }
- boolean updateResult = storager.updateParentPlatform(parentPlatform);
-
- if (updateResult) {
- // 淇濆瓨鏃跺惎鐢ㄥ氨鍙戦�佹敞鍐�
- if (parentPlatform.isEnable()) {
- if (parentPlatformOld != null && parentPlatformOld.isStatus()) {
- try {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
- }
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- logger.error("[绾跨▼浼戠湢澶辫触] : {}", e.getMessage());
- }
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- try {
- commanderForPlatform.register(parentPlatform, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
- }
-
- } else {
- // 鍙淇濆瓨灏卞彂閫佹敞鍐�
- try {
- commanderForPlatform.register(parentPlatform, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄥ唽: {}", e.getMessage());
- }
- }
- } else if (parentPlatformOld != null && parentPlatformOld.isEnable() && !parentPlatform.isEnable()) { // 鍏抽棴鍚敤鏃舵敞閿�
- try {
- commanderForPlatform.unregister(parentPlatformOld, null, null);
- } catch (InvalidArgumentException | ParseException | SipException e) {
- logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 娉ㄩ攢: {}", e.getMessage());
- }
- // 鍋滄璁㈤槄鐩稿叧鐨勫畾鏃朵换鍔�
- subscribeHolder.removeAllSubscribe(parentPlatform.getServerGBId());
- }
- } else {
- throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
- }
+ platformService.update(parentPlatform);
}
/**
@@ -274,12 +230,16 @@
throw new ControllerException(ErrorCode.ERROR400);
}
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(serverGBId);
+ ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(serverGBId);
if (parentPlatform == null) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
+ }
+ if (parentPlatformCatch == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴涓嶅瓨鍦�");
}
// 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
try {
- commanderForPlatform.unregister(parentPlatform, (event -> {
+ commanderForPlatform.unregister(parentPlatform, parentPlatformCatch.getSipTransactionInfo(), (event -> {
// 娓呯┖redis缂撳瓨
redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
@@ -379,7 +339,16 @@
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙版坊鍔犲浗鏍囬�氶亾API璋冪敤");
}
- int result = platformChannelService.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
+ int result = 0;
+ if (param.getChannelReduces() == null || param.getChannelReduces().size() == 0) {
+ if (param.isAll()) {
+ logger.info("[鍥芥爣绾ц仈]娣诲姞鎵�鏈夐�氶亾鍒颁笂绾у钩鍙帮紝 {}", param.getPlatformId());
+ List<ChannelReduce> allChannelForDevice = deviceChannelService.queryAllChannelList(param.getPlatformId());
+ result = platformChannelService.updateChannelForGB(param.getPlatformId(), allChannelForDevice, param.getCatalogId());
+ }
+ }else {
+ result = platformChannelService.updateChannelForGB(param.getPlatformId(), param.getChannelReduces(), param.getCatalogId());
+ }
if (result <= 0) {
throw new ControllerException(ErrorCode.ERROR100);
}
@@ -399,8 +368,15 @@
if (logger.isDebugEnabled()) {
logger.debug("缁欎笂绾у钩鍙板垹闄ゅ浗鏍囬�氶亾API璋冪敤");
}
- int result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
-
+ int result = 0;
+ if (param.getChannelReduces() == null || param.getChannelReduces().size() == 0) {
+ if (param.isAll()) {
+ logger.info("[鍥芥爣绾ц仈]绉婚櫎鎵�鏈夐�氶亾锛屼笂绾у钩鍙帮紝 {}", param.getPlatformId());
+ result = platformChannelService.delAllChannelForGB(param.getPlatformId(), param.getCatalogId());
+ }
+ }else {
+ result = storager.delChannelForGB(param.getPlatformId(), param.getChannelReduces());
+ }
if (result <= 0) {
throw new ControllerException(ErrorCode.ERROR100);
}
--
Gitblit v1.8.0