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/ICloudRecordService.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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..83b1b15 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,10 @@
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.service.bean.CloudRecordItem;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -14,14 +18,41 @@
/**
* 鍒嗛〉鍥炲幓浜戠褰曞儚鍒楄〃
*/
- 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<MediaServerItem> mediaServerItems);
+
+ /**
+ * 鏍规嵁hook娑堟伅澧炲姞涓�鏉¤褰�
+ */
+ void addRecord(OnRecordMp4HookParam param);
/**
* 鑾峰彇鎵�鏈夌殑鏃ユ湡
*/
- List<String> getDateList(Integer year, Integer month, String app, String stream);
+ List<String> getDateList(String app, String stream, int year, int month, List<MediaServerItem> mediaServerItems);
+
+ /**
+ * 娣诲姞鍚堝苟浠诲姟
+ */
+ String addTask(String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String remoteHost);
+ /**
+ * 鏌ヨ鍚堝苟浠诲姟鍒楄〃
+ */
+ JSONArray queryTask(String app, String stream, String callId, String taskId, String mediaServerId, Boolean isEnd);
+ /**
+ * 鏀惰棌瑙嗛锛屾敹钘忕殑瑙嗛杩囨湡涓嶄細鍒犻櫎
+ */
+ 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