From 9978d30aa1533c50bfaa48e44a1b0de4c157d10b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 四月 2024 09:36:48 +0800
Subject: [PATCH] Merge branch '2.7.0'
---
src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 3c8b9be..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,6 +1,9 @@
package com.genersoft.iot.vmp.service;
+import com.alibaba.fastjson2.JSONArray;
+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;
@@ -14,14 +17,37 @@
/**
* 鍒嗛〉鍥炲幓浜戠褰曞儚鍒楄〃
*/
- PageInfo<CloudRecordItem> getList(int page, int count, String startTime, String endTime);
+ PageInfo<CloudRecordItem> getList(int page, int count, String query, String app, String stream, String startTime, String endTime, List<MediaServer> mediaServerItems);
/**
* 鑾峰彇鎵�鏈夌殑鏃ユ湡
*/
- List<String> getDateList(Integer year, Integer month, String app, String stream);
+ List<String> getDateList(String app, String stream, int year, int month, List<MediaServer> mediaServerItems);
+
+ /**
+ * 娣诲姞鍚堝苟浠诲姟
+ */
+ 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, String scheme);
+ /**
+ * 鏀惰棌瑙嗛锛屾敹钘忕殑瑙嗛杩囨湡涓嶄細鍒犻櫎
+ */
+ int changeCollect(boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId);
+ /**
+ * 娣诲姞鎸囧畾褰曞儚鏀惰棌
+ */
+ int changeCollectById(Integer recordId, boolean result);
+
+ /**
+ * 鑾峰彇鎾斁鍦板潃
+ */
+ DownloadFileInfo getPlayUrlPath(Integer recordId);
}
--
Gitblit v1.8.0