From 2daa59d78ce206308c35294da04cffe5e340143a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 五月 2024 17:10:45 +0800
Subject: [PATCH] 支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
old mode 100644
new mode 100755
index 7d827d7..35028df
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
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;
@@ -27,6 +28,7 @@
* @author lin
*/
@Service
+@DS("master")
public class PlatformChannelServiceImpl implements IPlatformChannelService {
private final static Logger logger = LoggerFactory.getLogger(PlatformChannelServiceImpl.class);
@@ -82,7 +84,7 @@
int allCount = 0;
boolean result = false;
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
- int limitCount = 300;
+ int limitCount = 50;
if (channelReducesToAdd.size() > 0) {
if (channelReducesToAdd.size() > limitCount) {
for (int i = 0; i < channelReducesToAdd.size(); i += limitCount) {
@@ -125,23 +127,26 @@
private List<DeviceChannel> getDeviceChannelListByChannelReduceList(List<ChannelReduce> channelReduces, String catalogId, ParentPlatform platform) {
List<DeviceChannel> deviceChannelList = new ArrayList<>();
if (channelReduces.size() > 0){
- PlatformCatalog catalog = catalogManager.select(catalogId);
- if (catalog == null && !catalogId.equals(platform.getDeviceGBId())) {
+ PlatformCatalog catalog = catalogManager.selectByPlatFormAndCatalogId(platform.getServerGBId(),catalogId);
+ if (catalog == null && catalogId.equals(platform.getDeviceGBId())) {
+ for (ChannelReduce channelReduce : channelReduces) {
+ DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
+ deviceChannel.setParental(0);
+ deviceChannel.setCivilCode(platform.getServerGBDomain());
+ deviceChannelList.add(deviceChannel);
+ }
+ return deviceChannelList;
+ } else if (catalog == null && !catalogId.equals(platform.getDeviceGBId())) {
logger.warn("鏈煡璇㈠埌鐩綍{}鐨勪俊鎭�", catalogId);
return null;
}
for (ChannelReduce channelReduce : channelReduces) {
DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(channelReduce.getDeviceId(), channelReduce.getChannelId());
deviceChannel.setParental(0);
+ deviceChannel.setCivilCode(catalog.getCivilCode());
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
deviceChannelList.add(deviceChannel);
- if (platform.getTreeType().equals(TreeType.CIVIL_CODE)){
- deviceChannel.setCivilCode(catalogId);
- }else if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)){
- deviceChannel.setParentId(catalogId);
- if (catalog != null) {
- deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
- }
- }
}
}
return deviceChannelList;
@@ -159,13 +164,12 @@
return 0;
}
if (ObjectUtils.isEmpty(catalogId)) {
- catalogId = platform.getDeviceGBId();
+ catalogId = null;
}
- if ((result = platformChannelMapper.delChannelForGBByCatalogId(platformId, catalogId)) > 0) {
- List<DeviceChannel> deviceChannels = platformChannelMapper.queryAllChannelInCatalog(platformId, catalogId);
- eventPublisher.catalogEventPublish(platformId, deviceChannels, CatalogEvent.DEL);
- }
- return result;
+ List<DeviceChannel> deviceChannels = platformChannelMapper.queryAllChannelInCatalog(platformId, catalogId);
+ eventPublisher.catalogEventPublish(platformId, deviceChannels, CatalogEvent.DEL);
+
+ return platformChannelMapper.delChannelForGBByCatalogId(platformId, catalogId);
}
}
--
Gitblit v1.8.0