From b7ad0a907f59a2bc0455565e76c12bf152016469 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 十月 2023 18:06:46 +0800
Subject: [PATCH] 合并pr 优化sql
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index e2294f9..20ed8cb 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -2,13 +2,12 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.utils.DateUtil;
-import com.genersoft.iot.vmp.vmanager.gb28181.device.DeviceQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -16,6 +15,7 @@
@Configuration("mediaConfig")
+@Order(0)
public class MediaConfig{
private final static Logger logger = LoggerFactory.getLogger(MediaConfig.class);
@@ -75,9 +75,8 @@
@Value("${media.rtp.port-range}")
private String rtpPortRange;
-
@Value("${media.rtp.send-port-range}")
- private String sendRtpPortRange;
+ private String rtpSendPortRange;
@Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0;
@@ -191,10 +190,6 @@
return sipDomain;
}
- public String getSendRtpPortRange() {
- return sendRtpPortRange;
- }
-
public MediaServerItem getMediaSerItem(){
MediaServerItem mediaServerItem = new MediaServerItem();
mediaServerItem.setId(id);
@@ -214,14 +209,22 @@
mediaServerItem.setSecret(secret);
mediaServerItem.setRtpEnable(rtpEnable);
mediaServerItem.setRtpPortRange(rtpPortRange);
- mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
+ mediaServerItem.setSendRtpPortRange(rtpSendPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
- mediaServerItem.setHookAliveInterval(120);
+ mediaServerItem.setHookAliveInterval(30.00f);
mediaServerItem.setCreateTime(DateUtil.getNow());
mediaServerItem.setUpdateTime(DateUtil.getNow());
return mediaServerItem;
+ }
+
+ public String getRtpSendPortRange() {
+ return rtpSendPortRange;
+ }
+
+ public void setRtpSendPortRange(String rtpSendPortRange) {
+ this.rtpSendPortRange = rtpSendPortRange;
}
private boolean isValidIPAddress(String ipAddress) {
@@ -230,5 +233,4 @@
}
return false;
}
-
}
--
Gitblit v1.8.0