From abb60593cb77e9e9b6e67e8276fc416c2aede43f Mon Sep 17 00:00:00 2001
From: lin <18010473990@163.com>
Date: 星期六, 08 一月 2022 17:35:00 +0800
Subject: [PATCH] 优化级联平台GPS订阅
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 221 insertions(+), 12 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 a5a4be7..dba268d 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
@@ -6,6 +6,7 @@
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.*;
@@ -71,6 +72,9 @@
@Autowired
private GbStreamMapper gbStreamMapper;
+
+ @Autowired
+ private PlatformCatalogMapper catalogMapper;
;
@Autowired
@@ -110,6 +114,7 @@
*/
@Override
public synchronized boolean create(Device device) {
+ redisCatchStorage.updateDevice(device);
return deviceMapper.add(device) > 0;
}
@@ -128,10 +133,13 @@
Device deviceByDeviceId = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
if (deviceByDeviceId == null) {
device.setCreateTime(now);
+ redisCatchStorage.updateDevice(device);
return deviceMapper.add(device) > 0;
}else {
+ redisCatchStorage.updateDevice(device);
return deviceMapper.update(device) > 0;
}
+
}
@@ -149,6 +157,104 @@
}else {
deviceChannelMapper.update(channel);
}
+ }
+
+ @Override
+ public int updateChannels(String deviceId, List<DeviceChannel> channels) {
+ List<DeviceChannel> addChannels = new ArrayList<>();
+ List<DeviceChannel> updateChannels = new ArrayList<>();
+ HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
+ if (channels != null && channels.size() > 0) {
+ List<DeviceChannel> channelList = deviceChannelMapper.queryChannelsByDeviceId(deviceId);
+ if (channelList.size() == 0) {
+ for (DeviceChannel channel : channels) {
+ channel.setDeviceId(deviceId);
+ channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
+ String now = this.format.format(System.currentTimeMillis());
+ channel.setUpdateTime(now);
+ channel.setCreateTime(now);
+ addChannels.add(channel);
+ }
+ }else {
+ for (DeviceChannel deviceChannel : channelList) {
+ channelsInStore.put(deviceChannel.getChannelId(), deviceChannel);
+ }
+ for (DeviceChannel channel : channels) {
+ String channelId = channel.getChannelId();
+ channel.setDeviceId(deviceId);
+ channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
+ String now = this.format.format(System.currentTimeMillis());
+ channel.setUpdateTime(now);
+ if (channelsInStore.get(channel.getChannelId()) != null) {
+ updateChannels.add(channel);
+ }else {
+ addChannels.add(channel);
+ channel.setCreateTime(now);
+ }
+ }
+ }
+ int limitCount = 300;
+ if (addChannels.size() > 0) {
+ if (addChannels.size() > limitCount) {
+ for (int i = 0; i < addChannels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > addChannels.size()) {
+ toIndex = addChannels.size();
+ }
+ deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex));
+ }
+ }else {
+ deviceChannelMapper.batchAdd(addChannels);
+ }
+ }
+ if (updateChannels.size() > 0) {
+ if (updateChannels.size() > limitCount) {
+ for (int i = 0; i < updateChannels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > updateChannels.size()) {
+ toIndex = updateChannels.size();
+ }
+ 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);
+ try {
+ int cleanChannelsResult = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
+ int limitCount = 300;
+ boolean result = cleanChannelsResult <0;
+ if (!result && deviceChannelList.size() > 0) {
+ if (deviceChannelList.size() > limitCount) {
+ for (int i = 0; i < deviceChannelList.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > deviceChannelList.size()) {
+ toIndex = deviceChannelList.size();
+ }
+ result = result || deviceChannelMapper.batchAdd(deviceChannelList.subList(i, toIndex)) < 0;
+ }
+ }else {
+ result = result || deviceChannelMapper.batchAdd(deviceChannelList) < 0;
+ }
+ }
+ if (result) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ return true;
+ }catch (Exception e) {
+ dataSourceTransactionManager.rollback(transactionStatus);
+ return false;
+ }
+
}
@Override
@@ -186,19 +292,24 @@
public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
// 鑾峰彇鍒版墍鏈夋鍦ㄦ挱鏀剧殑娴�
PageHelper.startPage(page, count);
- List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
+ List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online);
return new PageInfo<>(all);
}
@Override
+ public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
+ return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit);
+ }
+
+ @Override
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
- return deviceChannelMapper.queryChannelsByDeviceId(deviceId, null,null, null, null);
+ return deviceChannelMapper.queryChannels(deviceId, null,null, null, null);
}
@Override
public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
PageHelper.startPage(page, count);
- List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
+ List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, null, null, null);
return new PageInfo<>(all);
}
@@ -279,6 +390,7 @@
}
device.setOnline(1);
logger.info("鏇存柊璁惧鍦ㄧ嚎: " + deviceId);
+ redisCatchStorage.updateDevice(device);
return deviceMapper.update(device) > 0;
}
@@ -294,6 +406,7 @@
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (device == null) return false;
device.setOnline(0);
+ redisCatchStorage.updateDevice(device);
return deviceMapper.update(device) > 0;
}
@@ -340,6 +453,9 @@
@Override
public boolean addParentPlatform(ParentPlatform parentPlatform) {
+ if (parentPlatform.getCatalogId() == null) {
+ parentPlatform.setCatalogId(parentPlatform.getServerGBId());
+ }
int result = platformMapper.addParentPlatform(parentPlatform);
return result > 0;
}
@@ -349,6 +465,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();
@@ -368,15 +487,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(gbStreams);
+ }
}
}
+
return result > 0;
}
@@ -427,10 +552,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());
@@ -465,6 +591,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
@@ -630,13 +768,13 @@
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);
}
-
}
}
}
@@ -695,4 +833,75 @@
public StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId) {
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) {
+ return catalogMapper.add(platformCatalog);
+ }
+
+ @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) {
+ catalogMapper.del(catalog.getId());
+ platformGbStreamMapper.delByCatalogId(catalog.getId());
+ platformChannelMapper.delByCatalogId(catalog.getId());
+ }else {
+ delCatalog(catalog.getId());
+ }
+ }
+ }
+ int delresult = catalogMapper.del(id);
+ int delStreamresult = platformGbStreamMapper.delByCatalogId(id);
+ int delChanneresult = platformChannelMapper.delByCatalogId(id);
+ return delresult + delChanneresult + delStreamresult;
+ }
+
+ @Override
+ public int updateCatalog(PlatformCatalog platformCatalog) {
+ return catalogMapper.update(platformCatalog);
+ }
+
+ @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) {
+ 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())) {
+ return platformGbStreamMapper.delByAppAndStream(gbStream.getApp(), gbStream.getStream());
+ }
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ public int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfos) {
+ return gbStreamMapper.updateStreamGPS(gpsMsgInfos);
+ }
}
--
Gitblit v1.8.0