From 5e82aa5f39981e6ba0909a493f091954cebd24c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 20 六月 2024 20:04:48 +0800
Subject: [PATCH] 优化拉流代理国标级联点播
---
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 1373530..d52fbc5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -39,10 +39,10 @@
private final Map<String, SipProviderImpl> tcpSipProviderMap = new ConcurrentHashMap<>();
private final Map<String, SipProviderImpl> udpSipProviderMap = new ConcurrentHashMap<>();
+ private final List<String> monitorIps = new ArrayList<>();
@Override
public void run(String... args) {
- List<String> monitorIps = new ArrayList<>();
if (ObjectUtils.isEmpty(sipConfig.getIp())) {
try {
// 鑾峰緱鏈満鐨勬墍鏈夌綉缁滄帴鍙�
@@ -60,7 +60,7 @@
if (nif.getName().startsWith("docker")) {
continue;
}
- logger.error("[鑷姩閰嶇疆SIP鐩戝惉缃戝崱] 缃戝崱鎺ュ彛鍦板潃锛� {}", addr.getHostAddress());// 鍙叧蹇� IPv4 鍦板潃
+ logger.info("[鑷姩閰嶇疆SIP鐩戝惉缃戝崱] 缃戝崱鎺ュ彛鍦板潃锛� {}", addr.getHostAddress());// 鍙叧蹇� IPv4 鍦板潃
monitorIps.add(addr.getHostAddress());
}
}
@@ -139,6 +139,9 @@
}
public SipProviderImpl getUdpSipProvider(String ip) {
+ if (udpSipProviderMap.size() == 1) {
+ return udpSipProviderMap.values().stream().findFirst().get();
+ }
if (ObjectUtils.isEmpty(ip)) {
return null;
}
@@ -160,6 +163,9 @@
}
public SipProviderImpl getTcpSipProvider(String ip) {
+ if (tcpSipProviderMap.size() == 1) {
+ return tcpSipProviderMap.values().stream().findFirst().get();
+ }
if (ObjectUtils.isEmpty(ip)) {
return null;
}
@@ -167,6 +173,9 @@
}
public String getLocalIp(String deviceLocalIp) {
+ if (monitorIps.size() == 1) {
+ return monitorIps.get(0);
+ }
if (!ObjectUtils.isEmpty(deviceLocalIp)) {
return deviceLocalIp;
}
--
Gitblit v1.8.0