From fff3d64f850b3ee61b9847cd80e7958c46cc6347 Mon Sep 17 00:00:00 2001
From: 庄梦蝶殇 <linhuaichuan1989@126.com>
Date: 星期三, 27 七月 2022 18:31:33 +0800
Subject: [PATCH] fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 77 +++-----------------------------------
1 files changed, 7 insertions(+), 70 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
index a839f72..6cdd108 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -443,20 +443,6 @@
// 鏇存柊缂撳瓨
parentPlatformCatch.setParentPlatform(parentPlatform);
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
- 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(parentPlatform.getServerGBId(), gbStreams);
- }
- }
- }
return result > 0;
}
@@ -650,62 +636,8 @@
}
@Override
- public void updateMediaList(List<StreamPushItem> streamPushItems) {
- if (streamPushItems == null || streamPushItems.size() == 0) {
- return;
- }
- logger.info("updateMediaList: " + streamPushItems.size());
- streamPushMapper.addAll(streamPushItems);
- // TODO 寰呬紭鍖�
- for (int i = 0; i < streamPushItems.size(); i++) {
- int onlineResult = mediaOnline(streamPushItems.get(i).getApp(), streamPushItems.get(i).getStream());
- if (onlineResult > 0) {
- // 鍙戦�佷笂绾块�氱煡
- eventPublisher.catalogEventPublishForStream(null, streamPushItems.get(i), CatalogEvent.ON);
- }
- }
- }
-
-
-
- @Override
- public void updateMedia(StreamPushItem streamPushItem) {
- streamPushMapper.del(streamPushItem.getApp(), streamPushItem.getStream());
- streamPushMapper.add(streamPushItem);
- mediaOffline(streamPushItem.getApp(), streamPushItem.getStream());
-
- if(!StringUtils.isEmpty(streamPushItem.getGbId() )){
- // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
- List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
- if (parentPlatforms.size() > 0) {
- for (ParentPlatform parentPlatform : parentPlatforms) {
- StreamProxyItem streamProxyItem = platformGbStreamMapper.selectOne(streamPushItem.getApp(), streamPushItem.getStream(),
- parentPlatform.getServerGBId());
- if (streamProxyItem == null) {
- streamPushItem.setCatalogId(parentPlatform.getCatalogId());
- streamPushItem.setPlatformId(parentPlatform.getServerGBId());
- platformGbStreamMapper.add(streamPushItem);
- eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), streamPushItem, CatalogEvent.ADD);
- }
- }
- }
- }
-
- }
-
- @Override
public int removeMedia(String app, String stream) {
return streamPushMapper.del(app, stream);
- }
-
- @Override
- public StreamPushItem getMedia(String app, String stream) {
- return streamPushMapper.selectOne(app, stream);
- }
-
- @Override
- public void clearMediaList() {
- streamPushMapper.clear();
}
@Override
@@ -715,7 +647,7 @@
if ("proxy".equals(gbStream.getStreamType())) {
result = streamProxyMapper.updateStatus(app, stream, false);
}else {
- result = streamPushMapper.updateStatus(app, stream, false);
+ result = streamPushMapper.updatePushStatus(app, stream, false);
}
return result;
}
@@ -727,7 +659,7 @@
if ("proxy".equals(gbStream.getStreamType())) {
result = streamProxyMapper.updateStatus(app, stream, true);
}else {
- result = streamPushMapper.updateStatus(app, stream, true);
+ result = streamPushMapper.updatePushStatus(app, stream, true);
}
return result;
}
@@ -773,6 +705,7 @@
if (platformCatalog.getPlatformId().equals(platformCatalog.getParentId())) {
// 绗竴灞傝妭鐐�
platformCatalog.setBusinessGroupId(platformCatalog.getId());
+ platformCatalog.setParentId(platform.getDeviceGBId());
}else {
// 鑾峰彇椤跺眰鐨�
PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platformCatalog.getPlatformId());
@@ -781,6 +714,10 @@
}
if (platform.getTreeType().equals(TreeType.CIVIL_CODE)) {
platformCatalog.setCivilCode(platformCatalog.getId());
+ if (platformCatalog.getPlatformId().equals(platformCatalog.getParentId())) {
+ // 绗竴灞傝妭鐐�
+ platformCatalog.setParentId(platform.getDeviceGBId());
+ }
}
int result = catalogMapper.add(platformCatalog);
--
Gitblit v1.8.0