From ac1a4a027a7bd88efb32e9da666bdba4b5fa166f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 14 一月 2022 17:04:26 +0800
Subject: [PATCH] 支持国标级联的目录订阅功能
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 315 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 294 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index a1f9331..e0b955f 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -1,11 +1,15 @@
package com.genersoft.iot.vmp.storager.impl;
+import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
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.IGbStreamService;
+import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.*;
@@ -23,21 +27,24 @@
import org.springframework.util.StringUtils;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
- * @description:瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
- * @author: swwheihei
- * @date: 2020骞�5鏈�6鏃� 涓嬪崍2:31:42
+ * 瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
+ * swwheihei
+ * 2020骞�5鏈�6鏃� 涓嬪崍2:31:42
*/
@SuppressWarnings("rawtypes")
@Component
public class VideoManagerStoragerImpl implements IVideoManagerStorager {
private Logger logger = LoggerFactory.getLogger(VideoManagerStoragerImpl.class);
+
+ @Autowired
+ EventPublisher eventPublisher;
+
+ @Autowired
+ SipConfig sipConfig;
@Autowired
DataSourceTransactionManager dataSourceTransactionManager;
@@ -71,6 +78,9 @@
@Autowired
private GbStreamMapper gbStreamMapper;
+
+ @Autowired
+ private PlatformCatalogMapper catalogMapper;
;
@Autowired
@@ -133,6 +143,7 @@
return deviceMapper.add(device) > 0;
}else {
redisCatchStorage.updateDevice(device);
+
return deviceMapper.update(device) > 0;
}
@@ -156,7 +167,7 @@
}
@Override
- public void updateChannels(String deviceId, List<DeviceChannel> channels) {
+ public int updateChannels(String deviceId, List<DeviceChannel> channels) {
List<DeviceChannel> addChannels = new ArrayList<>();
List<DeviceChannel> updateChannels = new ArrayList<>();
HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
@@ -210,13 +221,67 @@
if (i + limitCount > updateChannels.size()) {
toIndex = updateChannels.size();
}
- deviceChannelMapper.batchAdd(updateChannels.subList(i, toIndex));
+ deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex));
}
}else {
deviceChannelMapper.batchUpdate(updateChannels);
}
}
}
+ return addChannels.size() + updateChannels.size();
+ }
+
+ @Override
+ public boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList) {
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ // 鏁版嵁鍘婚噸
+ List<DeviceChannel> channels = new ArrayList<>();
+ StringBuilder stringBuilder = new StringBuilder();
+ if (deviceChannelList.size() > 1) {
+ // 鏁版嵁鍘婚噸
+ Set<String> gbIdSet = new HashSet<>();
+ for (DeviceChannel deviceChannel : deviceChannelList) {
+ if (!gbIdSet.contains(deviceChannel.getChannelId())) {
+ gbIdSet.add(deviceChannel.getChannelId());
+ channels.add(deviceChannel);
+ }else {
+ stringBuilder.append(deviceChannel.getChannelId() + ",");
+ }
+ }
+ }else {
+ channels = deviceChannelList;
+ }
+ if (stringBuilder.length() > 0) {
+ logger.debug("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
+ }
+ try {
+ int cleanChannelsResult = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
+ int limitCount = 300;
+ boolean result = cleanChannelsResult < 0;
+ if (!result && channels.size() > 0) {
+ if (channels.size() > limitCount) {
+ for (int i = 0; i < channels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > channels.size()) {
+ toIndex = channels.size();
+ }
+ result = result || deviceChannelMapper.batchAdd(channels.subList(i, toIndex)) < 0;
+ }
+ }else {
+ result = result || deviceChannelMapper.batchAdd(channels) < 0;
+ }
+ }
+ if (result) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ return true;
+ }catch (Exception e) {
+ dataSourceTransactionManager.rollback(transactionStatus);
+ return false;
+ }
+
}
@Override
@@ -353,6 +418,8 @@
device.setOnline(1);
logger.info("鏇存柊璁惧鍦ㄧ嚎: " + deviceId);
redisCatchStorage.updateDevice(device);
+ List<DeviceChannel> deviceChannelList = deviceChannelMapper.queryOnlineChannelsByDeviceId(deviceId);
+ eventPublisher.catalogEventPublish(null, deviceChannelList, CatalogEvent.ON);
return deviceMapper.update(device) > 0;
}
@@ -415,6 +482,9 @@
@Override
public boolean addParentPlatform(ParentPlatform parentPlatform) {
+ if (parentPlatform.getCatalogId() == null) {
+ parentPlatform.setCatalogId(parentPlatform.getServerGBId());
+ }
int result = platformMapper.addParentPlatform(parentPlatform);
return result > 0;
}
@@ -424,6 +494,9 @@
int result = 0;
ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
if (parentPlatform.getId() == null ) {
+ if (parentPlatform.getCatalogId() == null) {
+ parentPlatform.setCatalogId(parentPlatform.getServerGBId());
+ }
result = platformMapper.addParentPlatform(parentPlatform);
if (parentPlatformCatch == null) {
parentPlatformCatch = new ParentPlatformCatch();
@@ -443,15 +516,21 @@
// 鏇存柊缂撳瓨
parentPlatformCatch.setParentPlatform(parentPlatform);
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
- // 鍏变韩鎵�鏈夎棰戞祦锛岄渶瑕佸皢鐜版湁瑙嗛娴佹坊鍔犲埌姝ゅ钩鍙�
- List<GbStream> gbStreams = gbStreamMapper.selectAll();
- if (gbStreams.size() > 0) {
- if (parentPlatform.isShareAllLiveStream()) {
- gbStreamService.addPlatformInfo(gbStreams, parentPlatform.getServerGBId());
- }else {
- gbStreamService.delPlatformInfo(gbStreams);
+ if (parentPlatform.isEnable()) {
+ // 鍏变韩鎵�鏈夎棰戞祦锛岄渶瑕佸皢鐜版湁瑙嗛娴佹坊鍔犲埌姝ゅ钩鍙�
+ List<GbStream> gbStreams = gbStreamMapper.queryStreamNotInPlatform();
+ if (gbStreams.size() > 0) {
+ for (GbStream gbStream : gbStreams) {
+ gbStream.setCatalogId(parentPlatform.getCatalogId());
+ }
+ if (parentPlatform.isShareAllLiveStream()) {
+ gbStreamService.addPlatformInfo(gbStreams, parentPlatform.getServerGBId(), parentPlatform.getCatalogId());
+ }else {
+ gbStreamService.delPlatformInfo(parentPlatform.getServerGBId(), gbStreams);
+ }
}
}
+
return result > 0;
}
@@ -502,10 +581,11 @@
}
@Override
- public int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces) {
+ public int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces, String catalogId) {
Map<String, ChannelReduce> deviceAndChannels = new HashMap<>();
for (ChannelReduce channelReduce : channelReduces) {
+ channelReduce.setCatalogId(catalogId);
deviceAndChannels.put(channelReduce.getDeviceId() + "_" + channelReduce.getChannelId(), channelReduce);
}
List<String> deviceAndChannelList = new ArrayList<>(deviceAndChannels.keySet());
@@ -522,6 +602,9 @@
int result = 0;
if (channelReducesToAdd.size() > 0) {
result = platformChannelMapper.addChannels(platformId, channelReducesToAdd);
+ // TODO 鍚庣画缁欏钩鍙板鍔犳帶鍒跺紑鍏充互鎺у埗鏄惁鍝嶅簲鐩綍璁㈤槄
+ List<DeviceChannel> deviceChannelList = getDeviceChannelListByChannelReduceList(channelReducesToAdd, catalogId);
+ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.ADD);
}
return result;
@@ -532,7 +615,13 @@
public int delChannelForGB(String platformId, List<ChannelReduce> channelReduces) {
int result = platformChannelMapper.delChannelForGB(platformId, channelReduces);
-
+ List<DeviceChannel> deviceChannelList = new ArrayList<>();
+ for (ChannelReduce channelReduce : channelReduces) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(channelReduce.getChannelId());
+ deviceChannelList.add(deviceChannel);
+ }
+ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
return result;
}
@@ -540,6 +629,18 @@
public DeviceChannel queryChannelInParentPlatform(String platformId, String channelId) {
DeviceChannel channel = platformChannelMapper.queryChannelInParentPlatform(platformId, channelId);
return channel;
+ }
+
+ @Override
+ public List<PlatformCatalog> queryChannelInParentPlatformAndCatalog(String platformId, String catalogId) {
+ List<PlatformCatalog> catalogs = platformChannelMapper.queryChannelInParentPlatformAndCatalog(platformId, catalogId);
+ return catalogs;
+ }
+
+ @Override
+ public List<PlatformCatalog> queryStreamInParentPlatformAndCatalog(String platformId, String catalogId) {
+ List<PlatformCatalog> catalogs = platformGbStreamMapper.queryChannelInParentPlatformAndCatalogForCatlog(platformId, catalogId);
+ return catalogs;
}
@Override
@@ -659,7 +760,7 @@
* @return
*/
@Override
- public List<GbStream> queryStreamInParentPlatform(String platformId, String gbId) {
+ public GbStream queryStreamInParentPlatform(String platformId, String gbId) {
return gbStreamMapper.queryStreamInPlatform(platformId, gbId);
}
@@ -691,7 +792,11 @@
streamPushMapper.addAll(streamPushItems);
// TODO 寰呬紭鍖�
for (int i = 0; i < streamPushItems.size(); i++) {
- gbStreamMapper.setStatus(streamPushItems.get(i).getApp(), streamPushItems.get(i).getStream(), true);
+ int onlineResult = gbStreamMapper.setStatus(streamPushItems.get(i).getApp(), streamPushItems.get(i).getStream(), true);
+ if (onlineResult > 0) {
+ // 鍙戦�佷笂绾块�氱煡
+ eventPublisher.catalogEventPublishForStream(null, streamPushItems.get(i), CatalogEvent.ON);
+ }
}
}
@@ -700,18 +805,19 @@
streamPushMapper.del(streamPushItem.getApp(), streamPushItem.getStream());
streamPushMapper.add(streamPushItem);
gbStreamMapper.setStatus(streamPushItem.getApp(), streamPushItem.getStream(), true);
+
if(!StringUtils.isEmpty(streamPushItem.getGbId() )){
// 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
if (parentPlatforms.size() > 0) {
for (ParentPlatform parentPlatform : parentPlatforms) {
+ streamPushItem.setCatalogId(parentPlatform.getCatalogId());
streamPushItem.setPlatformId(parentPlatform.getServerGBId());
String stream = streamPushItem.getStream();
StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(streamPushItem.getApp(), stream, parentPlatform.getServerGBId());
if (streamProxyItems == null) {
platformGbStreamMapper.add(streamPushItem);
}
-
}
}
}
@@ -771,4 +877,171 @@
return streamProxyMapper.selectOne(app, streamId);
}
+ @Override
+ public List<PlatformCatalog> getChildrenCatalogByPlatform(String platformId, String parentId) {
+ return catalogMapper.selectByParentId(platformId, parentId);
+ }
+
+ @Override
+ public int addCatalog(PlatformCatalog platformCatalog) {
+ int result = catalogMapper.add(platformCatalog);
+ if (result > 0) {
+ DeviceChannel deviceChannel = getDeviceChannelByCatalog(platformCatalog);
+ eventPublisher.catalogEventPublish(platformCatalog.getPlatformId(), deviceChannel, CatalogEvent.ADD);
+ }
+ return result;
+ }
+
+ @Override
+ public PlatformCatalog getCatalog(String id) {
+ return catalogMapper.select(id);
+ }
+
+ @Override
+ public int delCatalog(String id) {
+ PlatformCatalog platformCatalog = catalogMapper.select(id);
+ if (platformCatalog.getChildrenCount() > 0) {
+ List<PlatformCatalog> platformCatalogList = catalogMapper.selectByParentId(platformCatalog.getPlatformId(), platformCatalog.getId());
+ for (PlatformCatalog catalog : platformCatalogList) {
+ if (catalog.getChildrenCount() == 0) {
+ delCatalogExecute(catalog.getId(), catalog.getPlatformId());
+ }else {
+ delCatalog(catalog.getId());
+ }
+ }
+ }
+ return delCatalogExecute(id, platformCatalog.getPlatformId());
+ }
+ private int delCatalogExecute(String id, String platformId) {
+ int delresult = catalogMapper.del(id);
+ DeviceChannel deviceChannelForCatalog = new DeviceChannel();
+ if (delresult > 0){
+ deviceChannelForCatalog.setChannelId(id);
+ eventPublisher.catalogEventPublish(platformId, deviceChannelForCatalog, CatalogEvent.DEL);
+ }
+
+ List<GbStream> gbStreams = platformGbStreamMapper.queryChannelInParentPlatformAndCatalog(platformId, id);
+ if (gbStreams.size() > 0){
+ List<DeviceChannel> deviceChannelList = new ArrayList<>();
+ for (GbStream gbStream : gbStreams) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(gbStream.getGbId());
+ deviceChannelList.add(deviceChannel);
+ }
+ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
+ }
+ int delStreamresult = platformGbStreamMapper.delByCatalogId(id);
+ List<PlatformCatalog> platformCatalogs = platformChannelMapper.queryChannelInParentPlatformAndCatalog(platformId, id);
+ if (platformCatalogs.size() > 0){
+ List<DeviceChannel> deviceChannelList = new ArrayList<>();
+ for (PlatformCatalog platformCatalog : platformCatalogs) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(platformCatalog.getId());
+ deviceChannelList.add(deviceChannel);
+ }
+ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
+ }
+ int delChannelresult = platformChannelMapper.delByCatalogId(id);
+ return delresult + delChannelresult + delStreamresult;
+ }
+
+
+ @Override
+ public int updateCatalog(PlatformCatalog platformCatalog) {
+ int result = catalogMapper.update(platformCatalog);
+ if (result > 0) {
+ DeviceChannel deviceChannel = getDeviceChannelByCatalog(platformCatalog);
+ eventPublisher.catalogEventPublish(platformCatalog.getPlatformId(), deviceChannel, CatalogEvent.UPDATE);
+ }
+ return result;
+ }
+
+ @Override
+ public int setDefaultCatalog(String platformId, String catalogId) {
+ return platformMapper.setDefaultCatalog(platformId, catalogId);
+ }
+
+ @Override
+ public List<PlatformCatalog> queryCatalogInPlatform(String platformId) {
+ return catalogMapper.selectByPlatForm(platformId);
+ }
+
+ @Override
+ public int delRelation(PlatformCatalog platformCatalog) {
+ if (platformCatalog.getType() == 1) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(platformCatalog.getId());
+ eventPublisher.catalogEventPublish(platformCatalog.getPlatformId(), deviceChannel, CatalogEvent.DEL);
+ return platformChannelMapper.delByCatalogIdAndChannelIdAndPlatformId(platformCatalog);
+ }else if (platformCatalog.getType() == 2) {
+ List<GbStream> gbStreams = platformGbStreamMapper.queryChannelInParentPlatformAndCatalog(platformCatalog.getPlatformId(), platformCatalog.getParentId());
+ for (GbStream gbStream : gbStreams) {
+ if (gbStream.getGbId().equals(platformCatalog.getId())) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(gbStream.getGbId());
+ eventPublisher.catalogEventPublish(platformCatalog.getPlatformId(), deviceChannel, CatalogEvent.DEL);
+ return platformGbStreamMapper.delByAppAndStream(gbStream.getApp(), gbStream.getStream());
+ }
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ public int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfos) {
+ return gbStreamMapper.updateStreamGPS(gpsMsgInfos);
+ }
+
+ private List<DeviceChannel> getDeviceChannelListByChannelReduceList(List<ChannelReduce> channelReduces, String catalogId) {
+ List<DeviceChannel> deviceChannelList = new ArrayList<>();
+ if (channelReduces.size() > 0){
+ for (ChannelReduce channelReduce : channelReduces) {
+ DeviceChannel deviceChannel = queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
+ deviceChannel.setParental(1);
+ deviceChannel.setParentId(catalogId);
+ deviceChannelList.add(deviceChannel);
+ }
+ }
+ return deviceChannelList;
+ }
+
+ private DeviceChannel getDeviceChannelByCatalog(PlatformCatalog catalog) {
+ ParentPlatform parentPlatByServerGBId = platformMapper.getParentPlatByServerGBId(catalog.getPlatformId());
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(catalog.getId());
+ deviceChannel.setName(catalog.getName());
+ deviceChannel.setLongitude(0.0);
+ deviceChannel.setLatitude(0.0);
+ deviceChannel.setDeviceId(parentPlatByServerGBId.getDeviceGBId());
+ deviceChannel.setManufacture("wvp-pro");
+ deviceChannel.setStatus(1);
+ deviceChannel.setParental(1);
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setRegisterWay(1);
+ deviceChannel.setCivilCode(sipConfig.getDomain());
+ deviceChannel.setModel("live");
+ deviceChannel.setOwner("wvp-pro");
+ deviceChannel.setSecrecy("0");
+ return deviceChannel;
+ }
+
+ @Override
+ public List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId) {
+ return deviceChannelMapper.queryOnlineChannelsByDeviceId(deviceId);
+ }
+
+ @Override
+ public List<ParentPlatform> queryPlatFormListForGBWithGBId(String channelId, List<String> platforms) {
+ return platformChannelMapper.queryPlatFormListForGBWithGBId(channelId, platforms);
+ }
+
+ @Override
+ public List<ParentPlatform> queryPlatFormListForStreamWithGBId(String app, String stream, List<String> platforms) {
+ return platformGbStreamMapper.queryPlatFormListForGBWithGBId(app, stream, platforms);
+ }
+
+ @Override
+ public GbStream getGbStream(String app, String streamId) {
+ return gbStreamMapper.selectOne(app, streamId);
+ }
}
--
Gitblit v1.8.0