From 268869c6a1ad052e358ee119ff892057a52725c0 Mon Sep 17 00:00:00 2001 From: wendy512 <wendy512@yeah.net> Date: 星期四, 29 二月 2024 21:10:56 +0800 Subject: [PATCH] bugfix:修复紫光华智录像查询返回StartTime、EndTime为2024-02-21T11:10:36+08:00,兼容多种不同日期格式 --- src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 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..333b7b3 --- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java @@ -1,17 +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.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.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); @@ -37,7 +39,7 @@ List<StreamPushItem> getPushList(String mediaSererId); - StreamPushItem transform(MediaItem item); + StreamPushItem transform(OnStreamChangedHookParam item); StreamPushItem getPush(String app, String streamId); @@ -100,4 +102,17 @@ * 澧炲姞鎺ㄦ祦 */ boolean add(StreamPushItem stream); + + /** + * 鑾峰彇鍏ㄩ儴鐨刟pp+Streanm 鐢ㄤ簬鍒ゆ柇鎺ㄦ祦鍒楄〃鏄柊澧炶繕鏄慨鏀� + * @return + */ + List<String> getAllAppAndStream(); + + /** + * 鑾峰彇缁熻淇℃伅 + * @return + */ + ResourceBaseInfo getOverview(); + } -- Gitblit v1.8.0