From b15e559eae82db811b31f1e3c47e3be027f20e27 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 一月 2024 16:18:28 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 11 +----------
1 files changed, 1 insertions(+), 10 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
index 8cfdd88..941cf6f 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -87,21 +87,12 @@
void updateMediaServerKeepalive(String mediaServerId, ServerKeepaliveData data);
- boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
-
/**
* 鑾峰彇璐熻浇淇℃伅
* @return
*/
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
- /**
- * 鎸夋椂闂存煡鎵惧綍鍍忔枃浠�
- */
- List<RecordFile> getRecords(String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems);
+ List<MediaServerItem> getAllWithAssistPort();
- /**
- * 鏌ユ壘瀛樺湪褰曞儚鏂囦欢鐨勬椂闂�
- */
- List<String> getRecordDates(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems);
}
--
Gitblit v1.8.0