From e1d476a54a7aa72f429e41e5c2957b77edbeb0a7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 13 三月 2024 15:24:09 +0800
Subject: [PATCH] 处理收到redis推动的推流设备信息内容重复的问题
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
old mode 100644
new mode 100755
index e539f23..2e6151d
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,10 +1,12 @@
package com.genersoft.iot.vmp.service;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.common.CommonCallback;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.ServerKeepaliveData;
+import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.genersoft.iot.vmp.vmanager.bean.RecordFile;
import java.util.List;
@@ -21,7 +23,7 @@
MediaServerItem getOne(String generalMediaServerId);
- MediaServerItem getOneByHostAndPort(String host, int port);
+ void syncCatchFromDatabase();
/**
* 鏂扮殑鑺傜偣鍔犲叆
@@ -30,15 +32,30 @@
*/
void zlmServerOnline(ZLMServerConfig zlmServerConfig);
- MediaServerItem getMediaServerForMinimumLoad();
+ /**
+ * 鑺傜偣绂荤嚎
+ * @param mediaServerId
+ * @return
+ */
+ void zlmServerOffline(String mediaServerId);
- void setZLMConfig(MediaServerItem mediaServerItem);
+ MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId);
+ void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback);
+ void updateVmServer(List<MediaServerItem> mediaServerItemList);
- void closeRTPServer(Device device, String channelId);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String presetSsrc, boolean ssrcCheck,
+ boolean isPlayback, Integer port, Boolean onlyAuto, Boolean reUsePort, Integer tcpMode);
+
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback, Integer port, Boolean onlyAuto);
+
+ void closeRTPServer(MediaServerItem mediaServerItem, String streamId);
+
+ void closeRTPServer(MediaServerItem mediaServerItem, String streamId, CommonCallback<Boolean> callback);
+ Boolean updateRtpServerSSRC(MediaServerItem mediaServerItem, String streamId, String ssrc);
+
+ void closeRTPServer(String mediaServerId, String streamId);
void clearRTPServer(MediaServerItem mediaServerItem);
@@ -48,11 +65,11 @@
void removeCount(String mediaServerId);
- void releaseSsrc(MediaServerItem mediaServerItem, String ssrc);
+ void releaseSsrc(String mediaServerItemId, String ssrc);
void clearMediaServerForOnline();
- WVPResult<String> add(MediaServerItem mediaSerItem);
+ void add(MediaServerItem mediaSerItem);
int addToDatabase(MediaServerItem mediaSerItem);
@@ -60,11 +77,24 @@
void resetOnlineServerItem(MediaServerItem serverItem);
- WVPResult<MediaServerItem> checkMediaServer(String ip, int port, String secret);
+ MediaServerItem checkMediaServer(String ip, int port, String secret);
boolean checkMediaRecordServer(String ip, int port);
void delete(String id);
+ void deleteDb(String id);
+
MediaServerItem getDefaultMediaServer();
+
+ void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data);
+
+ /**
+ * 鑾峰彇璐熻浇淇℃伅
+ * @return
+ */
+ MediaServerLoad getLoad(MediaServerItem mediaServerItem);
+
+ List<MediaServerItem> getAllWithAssistPort();
+
}
--
Gitblit v1.8.0