From 18a9f86a0af4863f1ec19b53d88ed2bcd46e37a7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 18 十二月 2023 09:59:06 +0800
Subject: [PATCH] Merge pull request #1209 from DavidSche/fix-1208
---
src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 36ae1b8..cf71bf1 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
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import okhttp3.*;
import okhttp3.logging.HttpLoggingInterceptor;
@@ -9,22 +9,18 @@
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;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.net.ConnectException;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.concurrent.TimeUnit;
@Component
public class AssistRESTfulUtils {
private final static Logger logger = LoggerFactory.getLogger(AssistRESTfulUtils.class);
+
public interface RequestCallback{
void run(JSONObject response);
@@ -50,7 +46,7 @@
if (mediaServerItem == null) {
return null;
}
- if (ObjectUtils.isEmpty(mediaServerItem.getRecordAssistPort())) {
+ if (mediaServerItem.getRecordAssistPort() <= 0) {
logger.warn("鏈惎鐢ˋssist鏈嶅姟");
return null;
}
@@ -137,6 +133,11 @@
return sendGet(mediaServerItem, "api/record/file/duration",param, callback);
}
+ public JSONObject getInfo(MediaServerItem mediaServerItem, RequestCallback callback){
+ Map<String, Object> param = new HashMap<>();
+ return sendGet(mediaServerItem, "api/record/info",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);
@@ -145,4 +146,25 @@
return sendGet(mediaServerItem, "api/record/addStreamCallInfo",param, callback);
}
+ public JSONObject getDateList(MediaServerItem mediaServerItem, String app, String stream, int year, int month) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("app", app);
+ param.put("stream", stream);
+ param.put("year", year);
+ param.put("month", month);
+ return sendGet(mediaServerItem, "api/record/date/list", param, null);
+ }
+
+ public JSONObject getFileList(MediaServerItem mediaServerItem, int page, int count, String app, String stream,
+ String startTime, String endTime) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("app", app);
+ param.put("stream", stream);
+ param.put("page", page);
+ param.put("count", count);
+ param.put("startTime", startTime);
+ param.put("endTime", endTime);
+ return sendGet(mediaServerItem, "api/record/file/listWithDate", param, null);
+ }
+
}
--
Gitblit v1.8.0