From 64be28ed77138a971f353119aeadc97025a0a06d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 10 一月 2024 16:17:53 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
old mode 100644
new mode 100755
index 0cde5fe..86e033c
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -113,20 +114,15 @@
deviceChannel.setStatus(gbStream.isStatus());
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(platform.getAdministrativeDivision());
- if (platform.getTreeType().equals(TreeType.CIVIL_CODE)){
- deviceChannel.setCivilCode(catalogId);
- }else if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)){
- PlatformCatalog catalog = catalogMapper.select(catalogId);
- if (catalog == null) {
- deviceChannel.setParentId(platform.getDeviceGBId());
- deviceChannel.setBusinessGroupId(null);
- }else {
- deviceChannel.setParentId(catalog.getId());
- deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
- }
-
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId);
+ if (catalog != null) {
+ deviceChannel.setCivilCode(catalog.getCivilCode());
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
+ }else {
+ deviceChannel.setCivilCode(platform.getAdministrativeDivision());
+ deviceChannel.setParentId(platform.getDeviceGBId());
}
deviceChannel.setModel("live");
@@ -221,20 +217,14 @@
deviceChannel.setStatus(status != null && status);
deviceChannel.setRegisterWay(1);
- deviceChannel.setCivilCode(platform.getAdministrativeDivision());
-
- if (platform.getTreeType().equals(TreeType.CIVIL_CODE)){
- deviceChannel.setCivilCode(catalogId);
- }else if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)){
- PlatformCatalog catalog = catalogMapper.select(catalogId);
- if (catalog == null) {
- deviceChannel.setParentId(platform.getDeviceGBId());
- deviceChannel.setBusinessGroupId(null);
- }else {
- deviceChannel.setParentId(catalog.getId());
- deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
- }
-
+ PlatformCatalog catalog = catalogMapper.selectByPlatFormAndCatalogId(platform.getServerGBId(), catalogId);
+ if (catalog != null) {
+ deviceChannel.setCivilCode(catalog.getCivilCode());
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
+ }else {
+ deviceChannel.setCivilCode(platform.getAdministrativeDivision());
+ deviceChannel.setParentId(platform.getDeviceGBId());
}
deviceChannel.setModel("live");
@@ -260,9 +250,6 @@
if (platform == null) {
return ;
}
- if (ObjectUtils.isEmpty(catalogId)) {
- catalogId = platform.getDeviceGBId();
- }
if (platformGbStreamMapper.delByPlatformAndCatalogId(platformId, catalogId) > 0) {
List<GbStream> gbStreams = platformGbStreamMapper.queryChannelInParentPlatformAndCatalog(platformId, catalogId);
List<DeviceChannel> deviceChannelList = new ArrayList<>();
@@ -274,4 +261,9 @@
eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
}
}
+
+ @Override
+ public List<GbStream> getGbChannelWithGbid(String gbId) {
+ return gbStreamMapper.selectByGBId(gbId);
+ }
}
--
Gitblit v1.8.0