From 6eed486ff1866c6d3ca7240e6c9cd1a5b4d5c6b7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 16 一月 2024 14:18:17 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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..b7f446a 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
@@ -36,7 +36,7 @@
private OkHttpClient getClient(){
return getClient(null);
}
-
+
private OkHttpClient getClient(Integer readTimeOut){
if (client == null) {
if (readTimeOut == null) {
@@ -242,7 +242,7 @@
public JSONObject addTask(MediaServerItem mediaServerItem, String app, String stream, String startTime,
String endTime, String callId, List<String> filePathList, String remoteHost) {
-
+
JSONObject videoTaskInfoJSON = new JSONObject();
videoTaskInfoJSON.put("app", app);
videoTaskInfoJSON.put("stream", stream);
@@ -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