From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容
---
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 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 da11b16..b3f4d7d
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
@@ -4,11 +4,11 @@
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
import com.genersoft.iot.vmp.storager.dao.PlatformCatalogMapper;
import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
-import com.genersoft.iot.vmp.service.IGbStreamService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -19,7 +19,6 @@
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -40,6 +39,9 @@
@Autowired
private PlatformGbStreamMapper platformGbStreamMapper;
+
+ @Autowired
+ private SubscribeHolder subscribeHolder;
@Autowired
private ParentPlatformMapper platformMapper;
@@ -74,16 +76,23 @@
}
try {
List<DeviceChannel> deviceChannelList = new ArrayList<>();
- for (GbStream gbStream : gbStreams) {
+
+
+ for (int i = 0; i < gbStreams.size(); i++) {
+ GbStream gbStream = gbStreams.get(i);
gbStream.setCatalogId(catalogId);
gbStream.setPlatformId(platformId);
// TODO 淇敼涓烘壒閲忔彁浜�
platformGbStreamMapper.add(gbStream);
+ logger.info("[鍏宠仈閫氶亾]鐩存挱娴侀�氶亾 骞冲彴锛歿}, 鍏遍渶鍏宠仈閫氶亾鏁�:{}, 宸插叧鑱旓細{}", platformId, gbStreams.size(), i + 1);
DeviceChannel deviceChannelListByStream = getDeviceChannelListByStreamWithStatus(gbStream, catalogId, parentPlatform);
deviceChannelList.add(deviceChannelListByStream);
}
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
- eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.ADD);
+ if (subscribeHolder.getCatalogSubscribe(platformId) != null) {
+ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.ADD);
+ }
+
result = true;
}catch (Exception e) {
logger.error("鎵归噺淇濆瓨娴佷笌骞冲彴鐨勫叧绯绘椂閿欒", e);
@@ -101,23 +110,18 @@
deviceChannel.setLatitude(gbStream.getLatitude());
deviceChannel.setDeviceId(platform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
- deviceChannel.setStatus(gbStream.isStatus()?1:0);
+ 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");
@@ -153,6 +157,10 @@
@Override
public void sendCatalogMsg(GbStream gbStream, String type) {
+ if (gbStream == null || type == null) {
+ logger.warn("[鍙戦�佺洰褰曡闃匽绫诲瀷锛氭祦淇℃伅鎴栫被鍨嬩负NULL");
+ return;
+ }
List<GbStream> gbStreams = new ArrayList<>();
if (gbStream.getGbId() != null) {
gbStreams.add(gbStream);
@@ -205,23 +213,17 @@
}else {
status = gbStreamMapper.selectStatusForPush(gbStream.getApp(), gbStream.getStream());
}
- deviceChannel.setStatus((status != null && status )?1:0);
+ 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");
@@ -230,4 +232,35 @@
deviceChannel.setSecrecy("0");
return deviceChannel;
}
+
+ @Override
+ public List<GbStream> getAllGBChannels(String platformId) {
+
+ return gbStreamMapper.selectAll(platformId, null, null, null);
+
+ }
+
+ @Override
+ public void delAllPlatformInfo(String platformId, String catalogId) {
+ if (platformId == null) {
+ return ;
+ }
+ ParentPlatform platform = platformMapper.getParentPlatByServerGBId(platformId);
+ 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<>();
+ for (GbStream gbStream : gbStreams) {
+ DeviceChannel deviceChannel = new DeviceChannel();
+ deviceChannel.setChannelId(gbStream.getGbId());
+ deviceChannelList.add(deviceChannel);
+ }
+ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL);
+ }
+ }
}
--
Gitblit v1.8.0