Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

648540858

2022-11-08 96bb3814f65edb36327eb02f2ea1beed30f06dfc

 src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java

@@ -1,12 +1,11 @@
package com.genersoft.iot.vmp.service;

import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.github.pagehelper.PageInfo;

import java.util.List;
@@ -37,7 +36,7 @@

    List<StreamPushItem> getPushList(String mediaSererId);

    StreamPushItem transform(MediaItem item);
    StreamPushItem transform(OnStreamChangedHookParam item);

    StreamPushItem getPush(String app, String streamId);

@@ -100,4 +99,16 @@
     * 增加推流
     */
    boolean add(StreamPushItem stream);

    /**
     * 获取全部的app+Streanm 用于判断推流列表是新增还是修改
     * @return
     */
    List<String> getAllAppAndStream();

    /**
     * 获取统计信息
     * @return
     */
    ResourceBaceInfo getOverview();
}