From dd4e0d0d9c75b5216b08644bfe1333a79f794b58 Mon Sep 17 00:00:00 2001
From: hexq <hexiaoqu@visioninsight.com>
Date: 星期六, 20 一月 2024 10:22:34 +0800
Subject: [PATCH] BUGFIX：向下级目录关联通道时，出现“未查询到目录xxx的信息"
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
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 1a8adb1..46522de 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
@@ -11,8 +11,10 @@
import com.genersoft.iot.vmp.service.ICloudRecordService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.CloudRecordServiceMapper;
+import com.genersoft.iot.vmp.utils.CloudRecordUtils;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.github.pagehelper.PageHelper;
@@ -107,22 +109,12 @@
}
@Override
- public String addTask(String app, String stream, String mediaServerId, 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) {
// 鍙傛暟鏍￠獙
assert app != null;
assert stream != null;
- MediaServerItem mediaServerItem = null;
- if (mediaServerId == null) {
- mediaServerItem = mediaServerService.getDefaultMediaServer();
- }else {
- mediaServerItem = mediaServerService.getOne(mediaServerId);
- }
- if (mediaServerItem == null) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
- }else {
- if (remoteHost == null) {
- remoteHost = "http://" + mediaServerItem.getStreamIp() + ":" + mediaServerItem.getRecordAssistPort();
- }
+ if (mediaServerItem.getRecordAssistPort() == 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "涓洪厤缃瓵ssist鏈嶅姟");
}
Long startTimeStamp = null;
Long endTimeStamp = null;
@@ -148,7 +140,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,15 +150,15 @@
if (mediaServerItem == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
}
- JSONObject result = assistRESTfulUtils.queryTaskList(mediaServerItem, taskId, isEnd);
- if (result.getInteger("code") != 0) {
- throw new ControllerException(result.getInteger("code"), result.getString("msg"));
+ JSONObject result = assistRESTfulUtils.queryTaskList(mediaServerItem, app, stream, callId, taskId, isEnd);
+ if (result == null || result.getInteger("code") != 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), result == null ? "鏌ヨ浠诲姟鍒楄〃澶辫触" : result.getString("msg"));
}
return result.getJSONArray("data");
}
@Override
- public void changeCollect(String type, boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId, String collectType) {
+ public int changeCollect(boolean result, String app, String stream, String mediaServerId, String startTime, String endTime, String callId) {
// 寮�濮嬫椂闂村拰缁撴潫鏃堕棿鍦ㄦ暟鎹簱涓兘鏄互绉掍负鍗曚綅鐨�
Long startTimeStamp = null;
Long endTimeStamp = null;
@@ -203,34 +195,35 @@
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板緟鏀惰棌鐨勮棰�");
}
int limitCount = 50;
+ int resultCount = 0;
if (all.size() > limitCount) {
for (int i = 0; i < all.size(); i += limitCount) {
int toIndex = i + limitCount;
if (i + limitCount > all.size()) {
toIndex = all.size();
}
- if ("collect".equals(collectType)) {
- cloudRecordServiceMapper.updateCollectList(result, all.subList(i, toIndex));
- }else if ("reserve".equals(collectType)) {
- cloudRecordServiceMapper.updateReserveList(result, all.subList(i, toIndex));
- }
+ resultCount += cloudRecordServiceMapper.updateCollectList(result, all.subList(i, toIndex));
}
}else {
- if ("collect".equals(collectType)) {
- cloudRecordServiceMapper.updateCollectList(result, all);
- }else if ("reserve".equals(collectType)) {
- cloudRecordServiceMapper.updateReserveList(result, all);
- }
+ resultCount = cloudRecordServiceMapper.updateCollectList(result, all);
}
+ return resultCount;
}
@Override
- public void changeCollectById(Integer recordId, String collectType, boolean result) {
- if ("collect".equals(collectType)) {
- cloudRecordServiceMapper.changeCollectById(result, recordId);
- }else if ("reserve".equals(collectType)) {
- cloudRecordServiceMapper.changeReserveById(result, recordId);
+ public int changeCollectById(Integer recordId, boolean result) {
+ return cloudRecordServiceMapper.changeCollectById(result, recordId);
+ }
+
+ @Override
+ public DownloadFileInfo getPlayUrlPath(Integer recordId) {
+ CloudRecordItem recordItem = cloudRecordServiceMapper.queryOne(recordId);
+ if (recordItem == null) {
+ throw new ControllerException(ErrorCode.ERROR400.getCode(), "璧勬簮涓嶅瓨鍦�");
}
+ String filePath = recordItem.getFilePath();
+ MediaServerItem mediaServerItem = mediaServerService.getOne(recordItem.getMediaServerId());
+ return CloudRecordUtils.getDownloadFilePath(mediaServerItem, filePath);
}
}
--
Gitblit v1.8.0