From 402ffa0b1e6b0453338a57469e00903564ac53f5 Mon Sep 17 00:00:00 2001 From: linshunhua <my_lv@163.com> Date: 星期二, 06 八月 2024 16:52:22 +0800 Subject: [PATCH] 修复在ORACLE,达梦等数据库下的用户查询BUG --- src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java old mode 100644 new mode 100755 index b95ec48..e315d92 --- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java @@ -1,20 +1,19 @@ 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.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; +import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis; -import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto; +import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo; import com.github.pagehelper.PageInfo; import java.util.List; import java.util.Map; +/** + * @author lin + */ public interface IStreamPushService { - - List<StreamPushItem> handleJSON(String json, MediaServerItem mediaServerItem); /** * 灏嗗簲鐢ㄥ悕鍜屾祦ID鍔犲叆鍥芥爣鍏宠仈 @@ -37,16 +36,16 @@ List<StreamPushItem> getPushList(String mediaSererId); - StreamPushItem transform(MediaItem item); + StreamPushItem transform(OnStreamChangedHookParam item); StreamPushItem getPush(String app, String streamId); /** * 鍋滄涓�璺帹娴� * @param app 搴旂敤鍚� - * @param streamId 娴両D + * @param stream 娴両D */ - boolean stop(String app, String streamId); + boolean stop(String app, String stream); /** * 鏂扮殑鑺傜偣鍔犲叆 @@ -100,4 +99,21 @@ * 澧炲姞鎺ㄦ祦 */ boolean add(StreamPushItem stream); + + /** + * 鑾峰彇鍏ㄩ儴鐨刟pp+Streanm 鐢ㄤ簬鍒ゆ柇鎺ㄦ祦鍒楄〃鏄柊澧炶繕鏄慨鏀� + * @return + */ + List<String> getAllAppAndStream(); + + /** + * 鑾峰彇缁熻淇℃伅 + * @return + */ + ResourceBaseInfo getOverview(); + + Map<String, StreamPushItem> getAllAppAndStreamMap(); + + + void updatePush(OnStreamChangedHookParam param); } -- Gitblit v1.8.0