From a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 24 二月 2022 16:55:06 +0800
Subject: [PATCH] 规范数据库，添加必要约束，优化通道批量导入功能
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 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 4c988d9..723e9f1 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -4,6 +4,8 @@
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;
@@ -55,7 +57,7 @@
* @param deviceId 璁惧id
* @param channels 澶氫釜閫氶亾
*/
- public void updateChannels(String deviceId, List<DeviceChannel> channels);
+ public int updateChannels(String deviceId, List<DeviceChannel> channels);
/**
* 寮�濮嬫挱鏀�
@@ -89,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);
/**
* 鑾峰彇鏌愪釜璁惧鐨勯�氶亾鍒楄〃
@@ -97,6 +108,7 @@
* @return
*/
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
+ public List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
/**
* 鑾峰彇鏌愪釜璁惧鐨勯�氶亾
@@ -227,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);
/**
* 鏌ヨ璁惧鐨勯�氶亾淇℃伅
@@ -241,7 +253,7 @@
* @param channelReduces
* @return
*/
- int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces);
+ int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces, String catalogId);
/**
* 绉婚櫎涓婄骇骞冲彴鐨勯�氶亾淇℃伅
@@ -253,6 +265,9 @@
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);
@@ -335,7 +350,7 @@
* @param channelId
* @return
*/
- List<GbStream> queryStreamInParentPlatform(String platformId, String channelId);
+ GbStream queryStreamInParentPlatform(String platformId, String channelId);
/**
* 鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦
@@ -383,18 +398,13 @@
void updateParentPlatformStatus(String platformGbID, boolean online);
/**
- * 鏇存柊濯掍綋鑺傜偣
- * @param mediaServerItem
- */
- void updateMediaServer(MediaServerItem mediaServerItem);
-
- /**
* 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠ｇ悊鍒楄〃
* @param id 濯掍綋ID
- * @param b 鍚敤/涓嶅惎鐢�
+ * @param enable 鍚敤/涓嶅惎鐢�
+ * @param status 鐘舵��
* @return
*/
- List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean b);
+ List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable, boolean status);
/**
* 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶�
@@ -422,4 +432,47 @@
* @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