From c7d15150237c946fbb4f5547dab0018a5f573d88 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 六月 2023 15:34:38 +0800
Subject: [PATCH] 增加redis通道
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 171 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 104 insertions(+), 67 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 35656dd..ed01b61 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
@@ -14,6 +14,7 @@
import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -124,47 +125,50 @@
List<DeviceChannel> channels = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
Map<String, Integer> subContMap = new HashMap<>();
- if (deviceChannelList.size() > 0) {
- // 鏁版嵁鍘婚噸
- Set<String> gbIdSet = new HashSet<>();
- for (DeviceChannel deviceChannel : deviceChannelList) {
- if (!gbIdSet.contains(deviceChannel.getChannelId())) {
- gbIdSet.add(deviceChannel.getChannelId());
- 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()){
- 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);
- });
- }
- }
+ // 鏁版嵁鍘婚噸
+ Set<String> gbIdSet = new HashSet<>();
+ for (DeviceChannel deviceChannel : deviceChannelList) {
+ if (gbIdSet.contains(deviceChannel.getChannelId())) {
+ stringBuilder.append(deviceChannel.getChannelId()).append(",");
+ continue;
+ }
+ gbIdSet.add(deviceChannel.getChannelId());
+ 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()){
+ 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);
+ });
}
- channels.add(deviceChannel);
- if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
- if (subContMap.get(deviceChannel.getParentId()) == null) {
- subContMap.put(deviceChannel.getParentId(), 1);
- }else {
- Integer count = subContMap.get(deviceChannel.getParentId());
- subContMap.put(deviceChannel.getParentId(), count++);
- }
- }
+
+ }
+ }
+ channels.add(deviceChannel);
+ if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
+ if (subContMap.get(deviceChannel.getParentId()) == null) {
+ subContMap.put(deviceChannel.getParentId(), 1);
}else {
- stringBuilder.append(deviceChannel.getChannelId()).append(",");
+ Integer count = subContMap.get(deviceChannel.getParentId());
+ subContMap.put(deviceChannel.getParentId(), count++);
}
}
- if (channels.size() > 0) {
- for (DeviceChannel channel : channels) {
- if (subContMap.get(channel.getChannelId()) != null){
- channel.setSubCount(subContMap.get(channel.getChannelId()));
+ }
+ if (channels.size() > 0) {
+ for (DeviceChannel channel : channels) {
+ if (subContMap.get(channel.getChannelId()) != null){
+ Integer count = subContMap.get(channel.getChannelId());
+ if (count > 0) {
+ channel.setSubCount(count);
+ channel.setParental(1);
}
}
}
-
}
+
if (stringBuilder.length() > 0) {
logger.info("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
}
@@ -183,10 +187,10 @@
if (i + limitCount > channels.size()) {
toIndex = channels.size();
}
- result = result || deviceChannelMapper.batchAdd(channels.subList(i, toIndex)) < 0;
+ result = result || deviceChannelMapper.batchAddOrUpdate(channels.subList(i, toIndex)) < 0;
}
}else {
- result = result || deviceChannelMapper.batchAdd(channels) < 0;
+ result = result || deviceChannelMapper.batchAddOrUpdate(channels) < 0;
}
}
if (result) {
@@ -196,7 +200,7 @@
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
return true;
}catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
return false;
}
@@ -233,8 +237,10 @@
if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
updateChannels.add(deviceChannel);
}else {
+ deviceChannel.setCreateTime(DateUtil.getNow());
addChannels.add(deviceChannel);
}
if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
@@ -282,10 +288,10 @@
if (i + limitCount > addChannels.size()) {
toIndex = addChannels.size();
}
- result = result || deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex)) < 0;
+ result = result || deviceChannelMapper.batchAddOrUpdate(addChannels.subList(i, toIndex)) < 0;
}
}else {
- result = result || deviceChannelMapper.batchAdd(addChannels) < 0;
+ result = result || deviceChannelMapper.batchAddOrUpdate(addChannels) < 0;
}
}
if (updateChannels.size() > 0) {
@@ -310,7 +316,7 @@
}
return true;
}catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
return false;
}
@@ -364,14 +370,19 @@
}
@Override
- public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds) {
- return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit,channelIds);
+ public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
+ return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, channelIds, null, query, hasSubChannel, online, start, limit);
}
@Override
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId,Boolean online,List<String> channelIds) {
return deviceChannelMapper.queryChannels(deviceId, null,null, null, online,channelIds);
+ }
+
+ @Override
+ public List<DeviceChannelExtend> queryChannelsByDeviceId(String deviceId, List<String> channelIds, Boolean online) {
+ return deviceChannelMapper.queryChannelsWithDeviceInfo(deviceId, null,null, null, online,channelIds);
}
@Override
@@ -433,9 +444,6 @@
*/
@Override
public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
- if (mobilePosition.getDeviceId().equals(mobilePosition.getChannelId())) {
- mobilePosition.setChannelId(null);
- }
return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
}
@@ -514,6 +522,16 @@
@Override
public List<ParentPlatform> queryEnableParentPlatformList(boolean enable) {
return platformMapper.getEnableParentPlatformList(enable);
+ }
+
+ @Override
+ public List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel() {
+ return platformMapper.queryEnablePlatformListWithAsMessageChannel();
+ }
+
+ @Override
+ public List<Device> queryDeviceWithAsMessageChannel() {
+ return deviceMapper.queryDeviceWithAsMessageChannel();
}
@Override
@@ -758,25 +776,49 @@
if (platform == null) {
return 0;
}
- if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
- if (platform.getDeviceGBId().equals(platformCatalog.getParentId())) {
- // 绗竴灞傝妭鐐�
- platformCatalog.setBusinessGroupId(platformCatalog.getId());
- platformCatalog.setParentId(platform.getDeviceGBId());
- }else {
- // 鑾峰彇椤跺眰鐨�
- PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platform.getDeviceGBId());
- platformCatalog.setBusinessGroupId(topCatalog.getId());
+ if (platformCatalog.getId().length() <= 8) {
+ platformCatalog.setCivilCode(platformCatalog.getParentId());
+ }else {
+ if (platformCatalog.getId().length() != 20) {
+ return 0;
+ }
+ if (platformCatalog.getParentId() != null) {
+ switch (Integer.parseInt(platformCatalog.getId().substring(10, 13))){
+ case 200:
+ case 215:
+ if (platformCatalog.getParentId().length() <= 8) {
+ platformCatalog.setCivilCode(platformCatalog.getParentId());
+ }else {
+ PlatformCatalog catalog = catalogMapper.select(platformCatalog.getParentId());
+ if (catalog != null) {
+ platformCatalog.setCivilCode(catalog.getCivilCode());
+ }
+ }
+ break;
+ case 216:
+ if (platformCatalog.getParentId().length() <= 8) {
+ platformCatalog.setCivilCode(platformCatalog.getParentId());
+ }else {
+ PlatformCatalog catalog = catalogMapper.select(platformCatalog.getParentId());
+ if (catalog == null) {
+ logger.warn("[娣诲姞鐩綍] 鏃犳硶鑾峰彇鐩綍{}鐨凜ivilCode鍜孊usinessGroupId", platformCatalog.getPlatformId());
+ break;
+ }
+ platformCatalog.setCivilCode(catalog.getCivilCode());
+ if (Integer.parseInt(platformCatalog.getParentId().substring(10, 13)) == 215) {
+ platformCatalog.setBusinessGroupId(platformCatalog.getParentId());
+ }else {
+ if (Integer.parseInt(platformCatalog.getParentId().substring(10, 13)) == 216) {
+ platformCatalog.setBusinessGroupId(catalog.getBusinessGroupId());
+ }
+ }
+ }
+ break;
+ default:
+ break;
+ }
}
}
- 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);
if (result > 0) {
DeviceChannel deviceChannel = getDeviceChannelByCatalog(platformCatalog);
@@ -900,19 +942,14 @@
DeviceChannel deviceChannel = new DeviceChannel();
deviceChannel.setChannelId(catalog.getId());
deviceChannel.setName(catalog.getName());
- deviceChannel.setLongitude(0.0);
- deviceChannel.setLatitude(0.0);
deviceChannel.setDeviceId(platform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
deviceChannel.setStatus(1);
deviceChannel.setParental(1);
deviceChannel.setRegisterWay(1);
- // 琛屾斂鍖哄垝搴旇鏄疍omain鐨勫墠鍏綅
- if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
- deviceChannel.setParentId(catalog.getParentId());
- deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
- }
+ deviceChannel.setParentId(catalog.getParentId());
+ deviceChannel.setBusinessGroupId(catalog.getBusinessGroupId());
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
--
Gitblit v1.8.0