From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 24 九月 2022 21:04:58 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
index 249ec03..345ea1e 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
@@ -9,6 +9,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.io.File;
@@ -49,7 +50,7 @@
if (mediaServerItem == null) {
return null;
}
- if (StringUtils.isEmpty(mediaServerItem.getRecordAssistPort())) {
+ if (mediaServerItem.getRecordAssistPort() <= 0) {
logger.warn("鏈惎鐢ˋssist鏈嶅姟");
return null;
}
@@ -136,4 +137,12 @@
return sendGet(mediaServerItem, "api/record/file/duration",param, callback);
}
+ public JSONObject addStreamCallInfo(MediaServerItem mediaServerItem, String app, String stream, String callId, RequestCallback callback){
+ Map<String, Object> param = new HashMap<>();
+ param.put("app",app);
+ param.put("stream",stream);
+ param.put("callId",callId);
+ return sendGet(mediaServerItem, "api/record/addStreamCallInfo",param, callback);
+ }
+
}
--
Gitblit v1.8.0