From d9cfe061b9b501511f5d769f751c8ff6bbcb1bf9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 八月 2023 15:20:25 +0800
Subject: [PATCH] 优化对讲释放流程
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 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 9239747..17bd613 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
@@ -6,7 +6,6 @@
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.StreamProxyItem;
-import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -91,12 +90,6 @@
@Autowired
private PlatformGbStreamMapper platformGbStreamMapper;
- @Autowired
- private IGbStreamService gbStreamService;
-
- @Autowired
- private ParentPlatformMapper parentPlatformMapper;
-
/**
* 鏍规嵁璁惧ID鍒ゆ柇璁惧鏄惁瀛樺湪
*
@@ -140,15 +133,21 @@
if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
- if (allChannelMap.get(deviceChannel.getChannelId()).getStatus() !=deviceChannel.getStatus()){
+ 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.getStatus()==1?CatalogEvent.ON:CatalogEvent.OFF);
+ eventPublisher.catalogEventPublish(platformId, deviceChannel, deviceChannel.isStatus()?CatalogEvent.ON:CatalogEvent.OFF);
});
}
}
+ deviceChannel.setUpdateTime(DateUtil.getNow());
+ updateChannels.add(deviceChannel);
+ }else {
+ deviceChannel.setCreateTime(DateUtil.getNow());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
+ addChannels.add(deviceChannel);
}
channels.add(deviceChannel);
if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
@@ -807,7 +806,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());
}
@@ -817,7 +816,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;
@@ -846,7 +845,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 {
@@ -855,27 +854,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);
@@ -892,7 +880,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<>();
@@ -903,7 +891,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