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 | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 d9d6fe3..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,23 +109,10 @@
}
@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鏈嶅姟");
}
@@ -162,8 +151,8 @@
throw new ControllerException(ErrorCode.ERROR100.getCode(), "鏈壘鍒板彲鐢ㄧ殑娴佸獟浣�");
}
JSONObject result = assistRESTfulUtils.queryTaskList(mediaServerItem, app, stream, callId, taskId, isEnd);
- if (result.getInteger("code") != 0) {
- throw new ControllerException(result.getInteger("code"), result.getString("msg"));
+ if (result == null || result.getInteger("code") != 0) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), result == null ? "鏌ヨ浠诲姟鍒楄〃澶辫触" : result.getString("msg"));
}
return result.getJSONArray("data");
}
@@ -226,4 +215,15 @@
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