From 01ecb07a2fac4ed96a318280bca88f3b9689500c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 十二月 2023 17:54:56 +0800
Subject: [PATCH] Merge branch 'wvp-28181-record' into feature/record

---
 src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
index 1287bc3..dd7de2b 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
@@ -10,6 +10,7 @@
 import com.genersoft.iot.vmp.service.ICloudRecordService;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.github.pagehelper.PageInfo;
 import io.swagger.v3.oas.annotations.Operation;
@@ -172,11 +173,14 @@
     @Parameter(name = "mediaServerId", description = "娴佸獟浣揑D", required = false)
     @Parameter(name = "isEnd", description = "鏄惁缁撴潫", required = false)
     public JSONArray queryTaskList(
+            @RequestParam(required = false) String app,
+            @RequestParam(required = false) String stream,
+            @RequestParam(required = false) String callId,
             @RequestParam(required = false) String taskId,
             @RequestParam(required = false) String mediaServerId,
             @RequestParam(required = false) Boolean isEnd
     ){
-        return cloudRecordService.queryTask(taskId, mediaServerId, isEnd);
+        return cloudRecordService.queryTask(app, stream, callId, taskId, mediaServerId, isEnd);
     }
 
     @ResponseBody
@@ -198,6 +202,8 @@
             @RequestParam(required = false) String callId,
             @RequestParam(required = false) Integer recordId
     ){
+        logger.info("[浜戠褰曞儚] 娣诲姞鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}",
+                app, stream, mediaServerId, startTime, endTime, callId, recordId);
         if (recordId != null) {
             return cloudRecordService.changeCollectById(recordId, true);
         }else {
@@ -224,10 +230,22 @@
             @RequestParam(required = false) String callId,
             @RequestParam(required = false) Integer recordId
     ){
+        logger.info("[浜戠褰曞儚] 绉婚櫎鏀惰棌锛宎pp={}锛宻tream={},mediaServerId={},startTime={},endTime={},callId={},recordId={}",
+                app, stream, mediaServerId, startTime, endTime, callId, recordId);
         if (recordId != null) {
             return cloudRecordService.changeCollectById(recordId, false);
         }else {
             return cloudRecordService.changeCollect(false, app, stream, mediaServerId, startTime, endTime, callId);
         }
     }
+
+    @ResponseBody
+    @GetMapping("/play/path")
+    @Operation(summary = "鑾峰彇鎾斁鍦板潃")
+    @Parameter(name = "recordId", description = "褰曞儚璁板綍鐨処D", required = true)
+    public DownloadFileInfo getPlayUrlPath(
+            @RequestParam(required = true) Integer recordId
+    ){
+        return cloudRecordService.getPlayUrlPath(recordId);
+    }
 }

--
Gitblit v1.8.0