From d09ee0c2ff93c799b0c19481f0890a5be5a2db03 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 18 六月 2021 19:44:55 +0800
Subject: [PATCH] 解决启动设置所有设备离线未删除redis记录
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java | 88 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
index 8ff9224..d0c88b0 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
@@ -2,14 +2,17 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.conf.MediaConfig;
import okhttp3.*;
+import org.checkerframework.checker.units.qual.A;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import java.io.IOException;
+import java.io.*;
import java.net.ConnectException;
import java.util.HashMap;
import java.util.Map;
@@ -20,14 +23,10 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRESTfulUtils.class);
- @Value("${media.ip}")
- private String mediaIp;
+ @Autowired
+ private MediaConfig mediaConfig;
- @Value("${media.port}")
- private int mediaPort;
- @Value("${media.secret}")
- private String mediaSecret;
public interface RequestCallback{
void run(JSONObject response);
@@ -35,12 +34,12 @@
public JSONObject sendPost(String api, Map<String, Object> param, RequestCallback callback) {
OkHttpClient client = new OkHttpClient();
- String url = String.format("http://%s:%s/index/api/%s", mediaIp, mediaPort, api);
+ String url = String.format("http://%s:%s/index/api/%s", mediaConfig.getIp(), mediaConfig.getHttpPort(), api);
JSONObject responseJSON = null;
logger.debug(url);
FormBody.Builder builder = new FormBody.Builder();
- builder.add("secret",mediaSecret);
+ builder.add("secret",mediaConfig.getSecret());
if (param != null && param.keySet().size() > 0) {
for (String key : param.keySet()){
if (param.get(key) != null) {
@@ -98,6 +97,53 @@
return responseJSON;
}
+
+ public void sendPostForImg(String api, Map<String, Object> param, String targetPath, String fileName) {
+ OkHttpClient client = new OkHttpClient();
+ String url = String.format("http://%s:%s/index/api/%s", mediaConfig.getIp(), mediaConfig.getHttpPort(), api);
+ JSONObject responseJSON = null;
+ logger.debug(url);
+
+ FormBody.Builder builder = new FormBody.Builder();
+ builder.add("secret",mediaConfig.getSecret());
+ if (param != null && param.keySet().size() > 0) {
+ for (String key : param.keySet()){
+ if (param.get(key) != null) {
+ builder.add(key, param.get(key).toString());
+ }
+ }
+ }
+
+ FormBody body = builder.build();
+
+ Request request = new Request.Builder()
+ .post(body)
+ .url(url)
+ .build();
+ try {
+ Response response = client.newCall(request).execute();
+ if (response.isSuccessful()) {
+ if (targetPath != null) {
+ File snapFolder = new File(targetPath);
+ if (!snapFolder.exists()) {
+ snapFolder.mkdirs();
+ }
+ File snapFile = new File(targetPath + "/" + fileName);
+ FileOutputStream outStream = new FileOutputStream(snapFile);
+ outStream.write(response.body().bytes());
+ outStream.close();
+ }
+ }
+ } catch (ConnectException e) {
+ logger.error(String.format("杩炴帴ZLM澶辫触: %s, %s", e.getCause().getMessage(), e.getMessage()));
+ logger.info("璇锋鏌edia閰嶇疆骞剁‘璁LM宸插惎鍔�...");
+ }catch (IOException e) {
+ logger.error(String.format("[ %s ]璇锋眰澶辫触: %s", url, e.getMessage()));
+ }
+
+ }
+
+
public JSONObject getMediaList(String app, String stream, String schema, RequestCallback callback){
Map<String, Object> param = new HashMap<>();
if (app != null) param.put("app",app);
@@ -130,13 +176,17 @@
return sendPost("getRtpInfo",param, null);
}
- public JSONObject addFFmpegSource(String src_url, String dst_url, String timeout_ms){
+ public JSONObject addFFmpegSource(String src_url, String dst_url, String timeout_ms,
+ boolean enable_hls, boolean enable_mp4, String ffmpeg_cmd_key){
logger.info(src_url);
logger.info(dst_url);
Map<String, Object> param = new HashMap<>();
param.put("src_url", src_url);
param.put("dst_url", dst_url);
param.put("timeout_ms", timeout_ms);
+ param.put("enable_hls", enable_hls);
+ param.put("enable_mp4", enable_mp4);
+ param.put("ffmpeg_cmd_key", ffmpeg_cmd_key);
return sendPost("addFFmpegSource",param, null);
}
@@ -194,4 +244,22 @@
param.put("force", 1);
return sendPost("close_streams",param, null);
}
+
+ public JSONObject getAllSession() {
+ return sendPost("getAllSession",null, null);
+ }
+
+ public void kickSessions(String localPortSStr) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("local_port", localPortSStr);
+ sendPost("kick_sessions",param, null);
+ }
+
+ public void getSnap(String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) {
+ Map<String, Object> param = new HashMap<>();
+ param.put("url", flvUrl);
+ param.put("timeout_sec", timeout_sec);
+ param.put("expire_sec", expire_sec);
+ sendPostForImg("getSnap",param, targetPath, fileName);
+ }
}
--
Gitblit v1.8.0