From 47e5d2b00b5b13c1004f94a7ccd3f406391698a0 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 一月 2024 15:58:50 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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);
}
--
Gitblit v1.8.0