From 0e94aeaf5fed799b419245ee4002c7b24d399ce4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 一月 2024 10:16:16 +0800
Subject: [PATCH] 优化录像合并下载,支持不过滤zlm节点ID
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 8 ++++++--
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java | 2 +-
src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
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 ce6395c..cb195ec 100755
--- a/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java
@@ -32,7 +32,8 @@
/**
* 娣诲姞鍚堝苟浠诲姟
*/
- String addTask(String app, String stream, MediaServerItem mediaServerItem, String startTime, String endTime, String callId, String remoteHost);
+ String addTask(String app, String stream, MediaServerItem mediaServerItem, String startTime,
+ String endTime, String callId, String remoteHost, boolean filterMediaServer);
/**
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 bb36e64..8e062f6 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
@@ -109,7 +109,8 @@
}
@Override
- public String addTask(String app, String stream, MediaServerItem mediaServerItem, String startTime, String endTime, String callId, String remoteHost) {
+ public String addTask(String app, String stream, MediaServerItem mediaServerItem, String startTime, String endTime,
+ String callId, String remoteHost, boolean filterMediaServer) {
// 鍙傛暟鏍￠獙
assert app != null;
assert stream != null;
@@ -125,8 +126,11 @@
endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime);
}
+ List<MediaServerItem> mediaServers = new ArrayList<>();
+ mediaServers.add(mediaServerItem);
// 妫�绱㈢浉鍏崇殑褰曞儚鏂囦欢
- List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathList(app, stream, startTimeStamp, endTimeStamp, callId, null);
+ List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathList(app, stream, startTimeStamp,
+ endTimeStamp, callId, filterMediaServer ? mediaServers : null);
if (filePathList == null || filePathList.isEmpty()) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈绱㈠埌瑙嗛鏂囦欢");
}
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 d2c5414..de9def5 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
@@ -177,7 +177,7 @@
remoteHost = request.getScheme() + "://" + request.getLocalAddr() + ":" + mediaServerItem.getRecordAssistPort();
}
}
- return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost);
+ return cloudRecordService.addTask(app, stream, mediaServerItem, startTime, endTime, callId, remoteHost, mediaServerId != null);
}
@ResponseBody
--
Gitblit v1.8.0