From 3d5842e9e2606cbcefed634dddc2867742d3f84e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 28 十一月 2023 09:30:49 +0800
Subject: [PATCH] 查询合并文件列表增加app,stream, callId过滤参数

---
 src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java        |    7 +++++--
 src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java |    5 ++++-
 src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java                |    2 +-
 src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java               |   11 ++++++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
index 4f6d3e9..9fda53e 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
@@ -257,8 +257,17 @@
         return sendPost(mediaServerItem, "api/record/file/download/task/add", videoTaskInfoJSON, null, 30);
     }
 
-    public JSONObject queryTaskList(MediaServerItem mediaServerItem, String taskId, Boolean isEnd) {
+    public JSONObject queryTaskList(MediaServerItem mediaServerItem, String app, String stream, String callId,  String taskId, Boolean isEnd) {
         Map<String, Object> param = new HashMap<>();
+        if (!ObjectUtils.isEmpty(app)) {
+            param.put("app", app);
+        }
+        if (!ObjectUtils.isEmpty(stream)) {
+            param.put("stream", stream);
+        }
+        if (!ObjectUtils.isEmpty(callId)) {
+            param.put("callId", callId);
+        }
         if (!ObjectUtils.isEmpty(taskId)) {
             param.put("taskId", taskId);
         }
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 8da31e6..87798a0 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
@@ -38,7 +38,7 @@
     /**
      * 鏌ヨ鍚堝苟浠诲姟鍒楄〃
      */
-    JSONArray queryTask(String taskId, String mediaServerId, Boolean isEnd);
+    JSONArray queryTask(String app, String stream, String callId, String taskId, String mediaServerId, Boolean isEnd);
 
     /**
      * 鏀惰棌瑙嗛锛屾敹钘忕殑瑙嗛杩囨湡涓嶄細鍒犻櫎
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
index 2954cd8..d9d6fe3 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
@@ -124,6 +124,9 @@
                 remoteHost = "http://" + mediaServerItem.getStreamIp() + ":" + mediaServerItem.getRecordAssistPort();
             }
         }
+        if (mediaServerItem.getRecordAssistPort() == 0) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "涓洪厤缃瓵ssist鏈嶅姟");
+        }
         Long startTimeStamp = null;
         Long endTimeStamp = null;
         if (startTime != null) {
@@ -148,7 +151,7 @@
     }
 
     @Override
-    public JSONArray queryTask(String taskId, String mediaServerId, Boolean isEnd) {
+    public JSONArray queryTask(String app, String stream, String callId, String taskId, String mediaServerId, Boolean isEnd) {
         MediaServerItem mediaServerItem = null;
         if (mediaServerId == null) {
             mediaServerItem = mediaServerService.getDefaultMediaServer();
@@ -158,7 +161,7 @@
         if (mediaServerItem == null) {
             throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
         }
-        JSONObject result =  assistRESTfulUtils.queryTaskList(mediaServerItem, taskId, isEnd);
+        JSONObject result =  assistRESTfulUtils.queryTaskList(mediaServerItem, app, stream, callId, taskId, isEnd);
         if (result.getInteger("code") != 0) {
             throw new ControllerException(result.getInteger("code"), result.getString("msg"));
         }
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 2c860e1..41633cf 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
@@ -172,11 +172,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

--
Gitblit v1.8.0