From 32fbfd8d1e77e8745482b6df487f7f0acdd2721b Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期日, 14 三月 2021 21:13:28 +0800
Subject: [PATCH] 增加上级平台查询DeviceInfo和DeviceStatus的响应功能
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 4a4f1f0..490bfd8 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -4,8 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import okhttp3.*;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +15,6 @@
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@@ -27,8 +24,11 @@
private final static Logger logger = LoggerFactory.getLogger(ZLMRunner.class);
+ // @Autowired
+ // private IVideoManagerStorager storager;
+
@Autowired
- private IVideoManagerStorager storager;
+ private IRedisCatchStorage redisCatchStorage;
@Value("${media.ip}")
private String mediaIp;
@@ -69,7 +69,7 @@
logger.info("zlm鎺ュ叆鎴愬姛...");
if (autoConfig) saveZLMConfig();
mediaServerConfig = getMediaServerConfig();
- storager.updateMediaInfo(mediaServerConfig);
+ redisCatchStorage.updateMediaInfo(mediaServerConfig);
}
}
@@ -99,9 +99,6 @@
logger.info("璁剧疆zlm...");
if (StringUtils.isEmpty(mediaHookIp)) {
mediaHookIp = sipIP;
- }
- if (mediaIp.equals(mediaHookIp)) {
- mediaHookIp = "127.0.0.1";
}
String hookPrex = String.format("http://%s:%s/index/hook", mediaHookIp, serverPort);
--
Gitblit v1.8.0