From f96250ef45af8d4c8f52fed382da058ab9330bbf Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 21 三月 2024 16:59:14 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java | 42 +++++++++++-------------------------------
1 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
index 0af9ba1..ceaafc4 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/service/IMediaServerService.java
@@ -1,9 +1,8 @@
package com.genersoft.iot.vmp.media.service;
import com.genersoft.iot.vmp.common.CommonCallback;
-import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;
+import com.genersoft.iot.vmp.common.StreamInfo;
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;
@@ -13,6 +12,8 @@
* 濯掍綋鏈嶅姟鑺傜偣
*/
public interface IMediaServerService {
+
+ List<MediaServerItem> getAllOnlineList();
List<MediaServerItem> getAll();
@@ -24,23 +25,7 @@
void syncCatchFromDatabase();
- /**
- * 鏂扮殑鑺傜偣鍔犲叆
- * @param zlmServerConfig
- * @return
- */
- void zlmServerOnline(ZLMServerConfig zlmServerConfig);
-
- /**
- * 鑺傜偣绂荤嚎
- * @param mediaServerId
- * @return
- */
- void zlmServerOffline(String mediaServerId);
-
MediaServerItem getMediaServerForMinimumLoad(Boolean hasAssist);
-
- void setZLMConfig(MediaServerItem mediaServerItem, boolean restart);
void updateVmServer(List<MediaServerItem> mediaServerItemList);
@@ -70,30 +55,25 @@
void add(MediaServerItem mediaSerItem);
- int addToDatabase(MediaServerItem mediaSerItem);
-
- int updateToDatabase(MediaServerItem mediaSerItem);
-
void resetOnlineServerItem(MediaServerItem serverItem);
- MediaServerItem checkMediaServer(String ip, int port, String secret);
+ MediaServerItem checkMediaServer(String ip, int port, String secret, String type);
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();
+ MediaServerItem getOneFromDatabase(String id);
+
+ boolean stopSendRtp(MediaServerItem mediaInfo, String app, String stream, String ssrc);
+
+ boolean deleteRecordDirectory(MediaServerItem mediaServerItem, String app, String stream, String date, String fileName);
+
+ List<StreamInfo> getMediaList(MediaServerItem mediaInfo, String app, String stream);
}
--
Gitblit v1.8.0