Commit 07729fbe4931d2ae8eb27ba555282867d584b02d
1 parent
9a89cf81
优化录像合并下载
Showing
2 changed files
with
1 additions
and
7 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java
| ... | ... | @@ -125,10 +125,8 @@ public class CloudRecordServiceImpl implements ICloudRecordService { |
| 125 | 125 | endTimeStamp = DateUtil.yyyy_MM_dd_HH_mm_ssToTimestamp(endTime); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - List<MediaServerItem> mediaServers = new ArrayList<>(); | |
| 129 | - mediaServers.add(mediaServerItem); | |
| 130 | 128 | // 检索相关的录像文件 |
| 131 | - List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathList(app, stream, startTimeStamp, endTimeStamp, callId, mediaServers); | |
| 129 | + List<String> filePathList = cloudRecordServiceMapper.queryRecordFilePathList(app, stream, startTimeStamp, endTimeStamp, callId, null); | |
| 132 | 130 | if (filePathList == null || filePathList.isEmpty()) { |
| 133 | 131 | throw new ControllerException(ErrorCode.ERROR100.getCode(), "未检索到视频文件"); |
| 134 | 132 | } | ... | ... |
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
| ... | ... | @@ -164,10 +164,6 @@ public class CloudRecordController { |
| 164 | 164 | @RequestParam(required = false) String callId, |
| 165 | 165 | @RequestParam(required = false) String remoteHost |
| 166 | 166 | ){ |
| 167 | - System.out.println(request.getScheme()); | |
| 168 | - System.out.println(request.getLocalAddr()); | |
| 169 | - System.out.println(request.getRemoteAddr()); | |
| 170 | - System.out.println(request.getRequestURI()); | |
| 171 | 167 | MediaServerItem mediaServerItem; |
| 172 | 168 | if (mediaServerId == null) { |
| 173 | 169 | mediaServerItem = mediaServerService.getDefaultMediaServer(); | ... | ... |