From 2de4c322f6dc79ecfb120106af07e3335994657a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 31 八月 2022 11:29:13 +0800
Subject: [PATCH] 去除对redis key过期事件的使用；重构国标级联的注册保活
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 39 ++++++++++-----------------------------
1 files changed, 10 insertions(+), 29 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 2a40330..bf42189 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,10 +25,7 @@
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;
@@ -70,6 +66,9 @@
@Autowired
private DynamicTask dynamicTask;
+ @Autowired
+ private IPlatformService platformService;
+
/**
* 鑾峰彇鍥芥爣鏈嶅姟鐨勯厤缃�
*
@@ -95,8 +94,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 +115,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 +134,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,33 +156,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()) {
- // 鍏抽棴鍚敤鏃舵敞閿�
- commanderForPlatform.unregister(parentPlatform, null, null);
- }
- return null;
- } else {
+ if (!updateResult) {
throw new ControllerException(ErrorCode.ERROR100.getCode(),"鍐欏叆鏁版嵁搴撳け璐�");
}
}
--
Gitblit v1.8.0