From bc431e429026d5efb9d404767f76a0724978d40d Mon Sep 17 00:00:00 2001
From: Cloud User <liaobin143@gmail.com>
Date: 星期五, 15 九月 2023 22:39:08 +0800
Subject: [PATCH] fix-use-source-ip-as-stream-ip
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 92 +++++++++++++++++++++++-----------------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
old mode 100644
new mode 100755
index 1d4c355..a316a5c
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -186,9 +186,19 @@
return false;
}
try {
- int cleanChannelsResult = deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
-
- int limitCount = 300;
+ int limitCount = 50;
+ int cleanChannelsResult = 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();
+ }
+ cleanChannelsResult += this.deviceChannelMapper.cleanChannelsNotInList(deviceId, channels.subList(i, toIndex));
+ }
+ } else {
+ cleanChannelsResult = this.deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
+ }
boolean result = cleanChannelsResult < 0;
if (!result && addChannels.size() > 0) {
if (addChannels.size() > limitCount) {
@@ -244,12 +254,12 @@
allChannelMap.put(deviceChannel.getChannelId(), deviceChannel);
}
}
- List<DeviceChannel> addChannels = new ArrayList<>();
- List<DeviceChannel> updateChannels = new ArrayList<>();
-
-
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
// 鏁版嵁鍘婚噸
+ List<DeviceChannel> channels = new ArrayList<>();
+
+ List<DeviceChannel> updateChannels = new ArrayList<>();
+ List<DeviceChannel> addChannels = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
Map<String, Integer> subContMap = new HashMap<>();
if (deviceChannelList.size() > 0) {
@@ -258,15 +268,24 @@
for (DeviceChannel deviceChannel : deviceChannelList) {
if (!gbIdSet.contains(deviceChannel.getChannelId())) {
gbIdSet.add(deviceChannel.getChannelId());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
- deviceChannel.setUpdateTime(DateUtil.getNow());
+ if (allChannelMap.get(deviceChannel.getChannelId()).isStatus() !=deviceChannel.isStatus()){
+ List<String> strings = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getChannelId());
+ if (!CollectionUtils.isEmpty(strings)){
+ strings.forEach(platformId->{
+ eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.isStatus()?CatalogEvent.ON:CatalogEvent.OFF);
+ });
+ }
+ }
updateChannels.add(deviceChannel);
}else {
deviceChannel.setCreateTime(DateUtil.getNow());
addChannels.add(deviceChannel);
}
+ channels.add(deviceChannel);
if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
if (subContMap.get(deviceChannel.getParentId()) == null) {
subContMap.put(deviceChannel.getParentId(), 1);
@@ -279,15 +298,8 @@
stringBuilder.append(deviceChannel.getChannelId()).append(",");
}
}
- if (addChannels.size() > 0) {
- for (DeviceChannel channel : addChannels) {
- if (subContMap.get(channel.getChannelId()) != null){
- channel.setSubCount(subContMap.get(channel.getChannelId()));
- }
- }
- }
- if (updateChannels.size() > 0) {
- for (DeviceChannel channel : updateChannels) {
+ if (channels.size() > 0) {
+ for (DeviceChannel channel : channels) {
if (subContMap.get(channel.getChannelId()) != null){
channel.setSubCount(subContMap.get(channel.getChannelId()));
}
@@ -298,12 +310,12 @@
if (stringBuilder.length() > 0) {
logger.info("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
}
- if(CollectionUtils.isEmpty(updateChannels) && CollectionUtils.isEmpty(addChannels) ){
- logger.info("閫氶亾鏇存柊锛屾暟鎹负绌�={}" , deviceChannelList);
+ if(CollectionUtils.isEmpty(channels)){
+ logger.info("閫氶亾閲嶈锛屾暟鎹负绌�={}" , deviceChannelList);
return false;
}
try {
- int limitCount = 300;
+ int limitCount = 50;
boolean result = false;
if (addChannels.size() > 0) {
if (addChannels.size() > limitCount) {
@@ -312,10 +324,10 @@
if (i + limitCount > addChannels.size()) {
toIndex = addChannels.size();
}
- result = result || deviceChannelMapper.batchAddOrUpdate(addChannels.subList(i, toIndex)) < 0;
+ result = result || deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex)) < 0;
}
}else {
- result = result || deviceChannelMapper.batchAddOrUpdate(addChannels) < 0;
+ result = result || deviceChannelMapper.batchAdd(addChannels) < 0;
}
}
if (updateChannels.size() > 0) {
@@ -331,13 +343,12 @@
result = result || deviceChannelMapper.batchUpdate(updateChannels) < 0;
}
}
+
if (result) {
//浜嬪姟鍥炴粴
dataSourceTransactionManager.rollback(transactionStatus);
- }else {
- //鎵嬪姩鎻愪氦
- dataSourceTransactionManager.commit(transactionStatus);
}
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
return true;
}catch (Exception e) {
logger.error("鏈鐞嗙殑寮傚父 ", e);
@@ -813,7 +824,7 @@
if (platformCatalog.getParentId().length() <= 8) {
platformCatalog.setCivilCode(platformCatalog.getParentId());
}else {
- PlatformCatalog catalog = catalogMapper.select(platformCatalog.getParentId());
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platformCatalog.getPlatformId(), platformCatalog.getParentId());
if (catalog != null) {
platformCatalog.setCivilCode(catalog.getCivilCode());
}
@@ -823,7 +834,7 @@
if (platformCatalog.getParentId().length() <= 8) {
platformCatalog.setCivilCode(platformCatalog.getParentId());
}else {
- PlatformCatalog catalog = catalogMapper.select(platformCatalog.getParentId());
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platformCatalog.getPlatformId(),platformCatalog.getParentId());
if (catalog == null) {
logger.warn("[娣诲姞鐩綍] 鏃犳硶鑾峰彇鐩綍{}鐨凜ivilCode鍜孊usinessGroupId", platformCatalog.getPlatformId());
break;
@@ -852,7 +863,7 @@
}
private PlatformCatalog getTopCatalog(String id, String platformId) {
- PlatformCatalog catalog = catalogMapper.selectParentCatalog(id);
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platformId, id);
if (catalog.getParentId().equals(platformId)) {
return catalog;
}else {
@@ -861,27 +872,16 @@
}
@Override
- public PlatformCatalog getCatalog(String id) {
- return catalogMapper.select(id);
+ public PlatformCatalog getCatalog(String platformId, String id) {
+ return catalogMapper.selectByPlatFormAndCatalogId(platformId, 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());
+ public int delCatalog(String platformId, String id) {
+ return delCatalogExecute(id, platformId);
}
private int delCatalogExecute(String id, String platformId) {
- int delresult = catalogMapper.del(id);
+ int delresult = catalogMapper.del(platformId, id);
DeviceChannel deviceChannelForCatalog = new DeviceChannel();
if (delresult > 0){
deviceChannelForCatalog.setChannelId(id);
@@ -898,7 +898,7 @@
}
eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
}
- int delStreamresult = platformGbStreamMapper.delByCatalogId(id);
+ int delStreamresult = platformGbStreamMapper.delByPlatformAndCatalogId(platformId,id);
List<PlatformCatalog> platformCatalogs = platformChannelMapper.queryChannelInParentPlatformAndCatalog(platformId, id);
if (platformCatalogs.size() > 0){
List<DeviceChannel> deviceChannelList = new ArrayList<>();
@@ -909,7 +909,7 @@
}
eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
}
- int delChannelresult = platformChannelMapper.delByCatalogId(id);
+ int delChannelresult = platformChannelMapper.delByCatalogId(platformId, id);
return delresult + delChannelresult + delStreamresult;
}
--
Gitblit v1.8.0