From 9c5b1060af4e6c468b2cf95fbb9ec6d0a05fad5c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 28 二月 2022 17:56:27 +0800 Subject: [PATCH] 支持删除在线设备 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 204 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 186 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java index 7656898..723e9f1 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -1,17 +1,18 @@ package com.genersoft.iot.vmp.storager; -import java.util.List; - -import com.genersoft.iot.vmp.gb28181.bean.Device; -import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; -import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto; -import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce; -import com.genersoft.iot.vmp.gb28181.bean.MobilePosition; +import com.genersoft.iot.vmp.gb28181.bean.*; +import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; +import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; +import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; +import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree; +import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; import com.github.pagehelper.PageInfo; +import java.util.List; + /** - * @Description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛 + * @description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛 * @author: swwheihei * @date: 2020骞�5鏈�6鏃� 涓嬪崍2:14:31 */ @@ -51,6 +52,14 @@ public void updateChannel(String deviceId, DeviceChannel channel); /** + * 鎵归噺娣诲姞璁惧閫氶亾 + * + * @param deviceId 璁惧id + * @param channels 澶氫釜閫氶亾 + */ + public int updateChannels(String deviceId, List<DeviceChannel> channels); + + /** * 寮�濮嬫挱鏀� * @param deviceId 璁惧id * @param channelId 閫氶亾ID @@ -82,6 +91,15 @@ * @return */ public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count); + + public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit); + + /** + * 鑾峰彇鏌愪釜璁惧鐨勯�氶亾鏍� + * @param deviceId 璁惧ID + * @return + */ + List<DeviceChannelTree> tree(String deviceId); /** * 鑾峰彇鏌愪釜璁惧鐨勯�氶亾鍒楄〃 @@ -90,6 +108,7 @@ * @return */ public List<DeviceChannel> queryChannelsByDeviceId(String deviceId); + public List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId); /** * 鑾峰彇鏌愪釜璁惧鐨勯�氶亾 @@ -97,6 +116,13 @@ * @param channelId 閫氶亾ID */ public DeviceChannel queryChannel(String deviceId, String channelId); + + /** + * 鍒犻櫎閫氶亾 + * @param deviceId 璁惧ID + * @param channelId 閫氶亾ID + */ + public int delChannel(String deviceId, String channelId); /** * 鑾峰彇澶氫釜璁惧 @@ -136,6 +162,13 @@ * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐� */ public boolean outline(String deviceId); + + /** + * 鏇存柊鎵�鏈夎澶囩绾� + * + * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐� + */ + public boolean outlineForAll(); /** @@ -196,7 +229,7 @@ * @param platformGbId * @return */ - ParentPlatform queryParentPlatById(String platformGbId); + ParentPlatform queryParentPlatByServerGBId(String platformGbId); /** * 鎵�鏈夊钩鍙扮绾� @@ -206,7 +239,7 @@ /** * 鏌ヨ閫氶亾淇℃伅锛屼笉鍖哄垎璁惧(宸插叧鑱斿钩鍙版垨鍏ㄩ儴) */ - PageInfo<ChannelReduce> queryAllChannelList(int page, int count, String query, Boolean online, Boolean channelType, String platformId, Boolean inPlatform); + PageInfo<ChannelReduce> queryAllChannelList(int page, int count, String query, Boolean online, Boolean channelType, String platformId, String catalogId); /** * 鏌ヨ璁惧鐨勯�氶亾淇℃伅 @@ -220,7 +253,7 @@ * @param channelReduces * @return */ - int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces); + int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces, String catalogId); /** * 绉婚櫎涓婄骇骞冲彴鐨勯�氶亾淇℃伅 @@ -233,12 +266,15 @@ DeviceChannel queryChannelInParentPlatform(String platformId, String channelId); + List<PlatformCatalog> queryChannelInParentPlatformAndCatalog(String platformId, String catalogId); + List<PlatformCatalog> queryStreamInParentPlatformAndCatalog(String platformId, String catalogId); + Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId); /** * 娣诲姞Mobile Position璁惧绉诲姩浣嶇疆 - * @param MobilePosition + * @param mobilePosition * @return */ public boolean insertMobilePosition(MobilePosition mobilePosition); @@ -268,14 +304,14 @@ * @param streamProxyDto * @return */ - public int addStreamProxy(StreamProxyDto streamProxyDto); + public boolean addStreamProxy(StreamProxyItem streamProxyDto); /** * 鏇存柊浠g悊娴� * @param streamProxyDto * @return */ - public int updateStreamProxy(StreamProxyDto streamProxyDto); + public boolean updateStreamProxy(StreamProxyItem streamProxyDto); /** * 绉婚櫎浠g悊娴� @@ -290,7 +326,7 @@ * @param enable * @return */ - public List<StreamProxyDto> getStreamProxyListForEnable(boolean enable); + public List<StreamProxyItem> getStreamProxyListForEnable(boolean enable); /** * 鎸夌収鏄痑pp鍜宻tream鑾峰彇浠g悊娴� @@ -298,7 +334,7 @@ * @param stream * @return */ - public StreamProxyDto queryStreamProxy(String app, String stream); + public StreamProxyItem queryStreamProxy(String app, String stream); /** * 鑾峰彇浠g悊娴� @@ -306,5 +342,137 @@ * @param count * @return */ - PageInfo<StreamProxyDto> queryStreamProxyList(Integer page, Integer count); + PageInfo<StreamProxyItem> queryStreamProxyList(Integer page, Integer count); + + /** + * 鏍规嵁鍥芥爣ID鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦 + * @param platformId + * @param channelId + * @return + */ + GbStream queryStreamInParentPlatform(String platformId, String channelId); + + /** + * 鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦 + * @param platformId + * @return + */ + List<GbStream> queryGbStreamListInPlatform(String platformId); + + /** + * 鎵归噺鏇存柊鎺ㄦ祦鍒楄〃 + * @param streamPushItems + */ + void updateMediaList(List<StreamPushItem> streamPushItems); + + /** + * 鏇存柊鍗曚釜鎺ㄦ祦 + * @param streamPushItem + */ + void updateMedia(StreamPushItem streamPushItem); + + /** + * 绉婚櫎鍗曚釜鎺ㄦ祦 + * @param app + * @param stream + */ + int removeMedia(String app, String stream); + + + /** + * 娓呯┖鎺ㄦ祦鍒楄〃 + */ + void clearMediaList(); + + /** + * 璁剧疆娴佺绾� + * @param app + * @param streamId + */ + int mediaOutline(String app, String streamId); + + /** + * 璁剧疆骞冲彴鍦ㄧ嚎/绂荤嚎 + * @param online + */ + void updateParentPlatformStatus(String platformGbID, boolean online); + + /** + * 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠g悊鍒楄〃 + * @param id 濯掍綋ID + * @param enable 鍚敤/涓嶅惎鐢� + * @param status 鐘舵�� + * @return + */ + List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable, boolean status); + + /** + * 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶� + * @param channelId 閫氶亾ID + * @return + */ + Device queryVideoDeviceByChannelId(String channelId); + + /** + * 閫氶亾涓婄嚎 + * @param channelId 閫氶亾ID + */ + void deviceChannelOnline(String deviceId, String channelId); + + /** + * 閫氶亾绂荤嚎 + * @param channelId 閫氶亾ID + */ + void deviceChannelOffline(String deviceId, String channelId); + + /** + * 閫氳繃app涓巗tream鑾峰彇StreamProxy + * @param app + * @param streamId + * @return + */ + StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId); + + /** + * catlog鏌ヨ缁撴潫鍚庡畬鍏ㄩ噸鍐欓�氶亾淇℃伅 + * @param deviceId + * @param deviceChannelList + */ + boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList); + + /** + * 鑾峰彇鐩綍淇℃伅 + * @param platformId + * @param parentId + * @return + */ + List<PlatformCatalog> getChildrenCatalogByPlatform(String platformId, String parentId); + + int addCatalog(PlatformCatalog platformCatalog); + + PlatformCatalog getCatalog(String id); + + int delCatalog(String id); + + int updateCatalog(PlatformCatalog platformCatalog); + + int setDefaultCatalog(String platformId, String catalogId); + + List<PlatformCatalog> queryCatalogInPlatform(String serverGBId); + + int delRelation(PlatformCatalog platformCatalog); + + int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfo); + + List<ParentPlatform> queryPlatFormListForGBWithGBId(String channelId, List<String> platforms); + + List<ParentPlatform> queryPlatFormListForStreamWithGBId(String app, String stream, List<String> platforms); + + GbStream getGbStream(String app, String streamId); + + void delCatalogByPlatformId(String serverGBId); + + void delRelationByPlatformId(String serverGBId); + + PlatformCatalog queryDefaultCatalogInPlatform(String platformId); } -- Gitblit v1.8.0