From 55de64069bd041db2a59f5f653920ccff24b3339 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Fri, 8 Sep 2023 16:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/wvp/proxy/WvpProxyClient.java      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/proxy/WvpProxyClient.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/proxy/WvpProxyClient.java
index 349a1d7..df54709 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/proxy/WvpProxyClient.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/proxy/WvpProxyClient.java
@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 
+import java.util.List;
+
 @FeignClient(name = "wvpProxyClient", url = "${proxy.wvp.url}")
 public interface WvpProxyClient {
     @GetMapping(value = "/api/user/login", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
@@ -90,11 +92,17 @@ public interface WvpProxyClient {
                                                      @PathVariable String mediaServerId,
                                                      @SpringQueryMap AddDownloadTaskReq req);
 
+    /**
+     * 获取视频裁剪合并任务列表
+     * <p>如果 GetDownloadTaskResp.isEnd = true, 就是已经处理完成, 可以直接用里面的 playUrl / downloadUrl下载</p>
+     * @param token 认证token
+     * @param mediaServerId 流媒体服务id, 从 downloadStart/downloadProgress 获得
+     * @param req GetDownloadTaskReq 请求参数
+     * @return GetDownloadTaskResp 任务列表
+     */
     // /record_proxy/your_server_id/api/record/file/download/task/list?app=rtp&stream=59777645&taskId=0490d767d94ce20aedce57c862b6bfe9&isEnd=true
     @GetMapping("/record_proxy/{mediaServerId}/api/record/file/download/task/list")
-    JsonResponse<GetDownloadTaskResp> getDownloadTask4MediaServer(@RequestHeader("access-token") String token,
-                                                                  @PathVariable String mediaServerId,
-                                                                  @SpringQueryMap GetDownloadTaskReq req);
-
-    // /api/gb_record/download/progress/44050100001180000001/44050100001310000001/59777645
+    JsonResponse<List<GetDownloadTaskResp>> getDownloadTask4MediaServer(@RequestHeader("access-token") String token,
+                                                                        @PathVariable String mediaServerId,
+                                                                        @SpringQueryMap GetDownloadTaskReq req);
 }