From b45d71ba6d7474dc21dfa54df37876429bf2ec46 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 10 四月 2024 22:56:14 +0800
Subject: [PATCH] Merge pull request #1389 from ancienter/develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
index ce6395c..875140f 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
@@ -1,9 +1,9 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson2.JSONArray;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRecordMp4HookParam;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -17,28 +17,24 @@
/**
* 鍒嗛〉鍥炲幓浜戠褰曞儚鍒楄〃
*/
- PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServerItem> mediaServerItems);
-
- /**
- * 鏍规嵁hook娑堟伅澧炲姞涓�鏉¤褰�
- */
- void addRecord(OnRecordMp4HookParam param);
+ PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServer> mediaServerItems);
/**
* 鑾峰彇鎵�鏈夌殑鏃ユ湡
*/
- List<String> getDateList(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems);
+ List<String> getDateList(String app, String stream, int year, int month, List<MediaServer> mediaServerItems);
/**
* 娣诲姞鍚堝苟浠诲姟
*/
- String addTask(String app, String stream, MediaServerItem mediaServerItem, String startTime, String endTime, String callId, String remoteHost);
+ String addTask(String app, String stream, MediaServer mediaServerItem, String startTime,
+ String endTime, String callId, String remoteHost, boolean filterMediaServer);
/**
* 鏌ヨ鍚堝苟浠诲姟鍒楄〃
*/
- JSONArray queryTask(String app, String stream, String callId, String taskId, String mediaServerId, Boolean isEnd);
+ JSONArray queryTask(String app, String stream, String callId, String taskId, String mediaServerId, Boolean isEnd, String scheme);
/**
* 鏀惰棌瑙嗛锛屾敹钘忕殑瑙嗛杩囨湡涓嶄細鍒犻櫎
@@ -50,4 +46,8 @@
*/
int changeCollectById(Integer recordId, boolean result);
+ /**
+ * 鑾峰彇鎾斁鍦板潃
+ */
+ DownloadFileInfo getPlayUrlPath(Integer recordId);
}
--
Gitblit v1.8.0