mirror of
https://gitee.com/pan648540858/wvp-GB28181-pro.git
synced 2026-05-23 21:47:49 +08:00
合并主线
This commit is contained in:
parent
b4fb076246
commit
975993f8b0
@ -94,13 +94,6 @@ public interface IMediaServerService {
|
|||||||
*/
|
*/
|
||||||
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
|
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
|
||||||
|
|
||||||
List<MediaServerItem> getAllWithAssistPort();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查找存在录像文件的时间
|
|
||||||
*/
|
|
||||||
List<String> getRecordDates(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取媒体流的信息
|
* 获取媒体流的信息
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -740,11 +740,6 @@ public class MediaServerServiceImpl implements IMediaServerService {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<MediaServerItem> getAllWithAssistPort() {
|
|
||||||
return mediaServerMapper.queryAllWithAssistPort();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public StreamMediaInfo getMediaInfo(String mediaServerId, String app, String stream) {
|
public StreamMediaInfo getMediaInfo(String mediaServerId, String app, String stream) {
|
||||||
MediaServerItem mediaServerItem = getOne(mediaServerId);
|
MediaServerItem mediaServerItem = getOne(mediaServerId);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user