From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期一, 24 七月 2023 14:10:46 +0800
Subject: [PATCH] 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 6b8550d..f4bcb1a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -2,43 +2,37 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.VersionPo;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.utils.SpringBeanFactory;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import com.genersoft.iot.vmp.vmanager.bean.ResourceInfo;
import com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
-import gov.nist.javax.sip.SipStackImpl;
-
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
-import javax.sip.ListeningPoint;
-import javax.sip.ObjectInUseException;
-import javax.sip.SipProvider;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("rawtypes")
@Tag(name = "鏈嶅姟鎺у埗")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/server")
public class ServerController {
@@ -77,10 +71,10 @@
@Autowired
- private ThreadPoolTaskExecutor taskExecutor;
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private SendRtpPortManager sendRtpPortManager;
@GetMapping(value = "/media_server/list")
@@ -261,15 +255,23 @@
@Operation(summary = "鑾峰彇璐熻浇淇℃伅")
public ResourceInfo getResourceInfo() {
ResourceInfo result = new ResourceInfo();
- ResourceBaceInfo deviceInfo = deviceService.getOverview();
+ ResourceBaseInfo deviceInfo = deviceService.getOverview();
result.setDevice(deviceInfo);
- ResourceBaceInfo channelInfo = channelService.getOverview();
+ ResourceBaseInfo channelInfo = channelService.getOverview();
result.setChannel(channelInfo);
- ResourceBaceInfo pushInfo = pushService.getOverview();
+ ResourceBaseInfo pushInfo = pushService.getOverview();
result.setPush(pushInfo);
- ResourceBaceInfo proxyInfo = proxyService.getOverview();
+ ResourceBaseInfo proxyInfo = proxyService.getOverview();
result.setProxy(proxyInfo);
return result;
}
+
+ @PostMapping(value = "/test/getPort")
+ @ResponseBody
+ public int getPort() {
+ int result = sendRtpPortManager.getNextPort(mediaServerService.getDefaultMediaServer());
+ System.out.println(result);
+ return result;
+ }
}
--
Gitblit v1.8.0