From b17280522b3569b49c0d524b7ed7fb45ef0e991a Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 02 四月 2021 19:04:01 +0800
Subject: [PATCH] 增加推流转发到国标，尚不完善
---
src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java
index 0710f9b..e01b06e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/media/MediaController.java
@@ -2,9 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
+import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.vmanager.service.IMediaService;
-import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
+import com.genersoft.iot.vmp.service.IMediaService;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,25 +24,16 @@
private final static Logger logger = LoggerFactory.getLogger(MediaController.class);
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private IVideoManagerStorager storager;
@Autowired
- private IStreamProxyService streamProxyService;
+ private IStreamPushService streamPushService;
@Autowired
private IMediaService mediaService;
- @RequestMapping(value = "/list")
- @ResponseBody
- public JSONObject list( @RequestParam(required = false)Integer page,
- @RequestParam(required = false)Integer count,
- @RequestParam(required = false)String q,
- @RequestParam(required = false)Boolean online ){
- JSONObject jsonObject = redisCatchStorage.getMediaList(page - 1, page - 1 + count);
- return jsonObject;
- }
@RequestMapping(value = "/getStreamInfoByAppAndStream")
@ResponseBody
@@ -46,4 +41,6 @@
return mediaService.getStreamInfoByAppAndStreamWithCheck(app, stream);
}
+
+
}
--
Gitblit v1.8.0