From 55b15f8ba657aac29929c6441baccf052311410c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 一月 2024 17:45:11 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 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 ba3e365..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
@@ -109,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鏈嶅姟");
}
@@ -165,7 +152,7 @@
}
JSONObject result = assistRESTfulUtils.queryTaskList(mediaServerItem, app, stream, callId, taskId, isEnd);
if (result == null || result.getInteger("code") != 0) {
- throw new ControllerException(ErrorCode.ERROR100.getCode(), result.getString("msg"));
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), result == null ? "鏌ヨ浠诲姟鍒楄〃澶辫触" : result.getString("msg"));
}
return result.getJSONArray("data");
}
--
Gitblit v1.8.0