panlinlin
2021-04-02 b17280522b3569b49c0d524b7ed7fb45ef0e991a
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);
    }
}