From 23beb4fde063b4a648c2a273f17cf5c423fa0ae6 Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期一, 01 四月 2024 09:19:46 +0800
Subject: [PATCH] Merge branch 'master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 657f294..2e6151d
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -6,6 +6,7 @@
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.RecordFile;
import java.util.List;
@@ -88,11 +89,12 @@
void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data);
- boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
-
/**
* 鑾峰彇璐熻浇淇℃伅
* @return
*/
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
+
+ List<MediaServerItem> getAllWithAssistPort();
+
}
--
Gitblit v1.8.0