From b498e2fcf21ee4f612dfaf0b45a945c52da37c60 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 12 五月 2023 12:36:38 +0800
Subject: [PATCH] 更新文档
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 187 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 169 insertions(+), 18 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 377b20f..cee613d 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;
@@ -133,6 +134,15 @@
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())) {
@@ -174,10 +184,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) {
@@ -187,11 +197,126 @@
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
return true;
}catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
return false;
}
+ }
+
+
+ @Override
+ public boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList) {
+ if (CollectionUtils.isEmpty(deviceChannelList)) {
+ return false;
+ }
+ List<DeviceChannel> allChannels = deviceChannelMapper.queryAllChannels(deviceId);
+ Map<String,DeviceChannel> allChannelMap = new ConcurrentHashMap<>();
+ if (allChannels.size() > 0) {
+ for (DeviceChannel deviceChannel : allChannels) {
+ allChannelMap.put(deviceChannel.getChannelId(), deviceChannel);
+ }
+ }
+ List<DeviceChannel> addChannels = new ArrayList<>();
+ List<DeviceChannel> updateChannels = new ArrayList<>();
+
+
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ // 鏁版嵁鍘婚噸
+ 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());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
+ updateChannels.add(deviceChannel);
+ }else {
+ deviceChannel.setCreateTime(DateUtil.getNow());
+ addChannels.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++);
+ }
+ }
+ }else {
+ stringBuilder.append(deviceChannel.getChannelId()).append(",");
+ }
+ }
+ if (addChannels.size() > 0) {
+ for (DeviceChannel channel : addChannels) {
+ if (subContMap.get(channel.getChannelId()) != null){
+ channel.setSubCount(subContMap.get(channel.getChannelId()));
+ }
+ }
+ }
+ if (updateChannels.size() > 0) {
+ for (DeviceChannel channel : updateChannels) {
+ if (subContMap.get(channel.getChannelId()) != null){
+ channel.setSubCount(subContMap.get(channel.getChannelId()));
+ }
+ }
+ }
+
+ }
+ if (stringBuilder.length() > 0) {
+ logger.info("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
+ }
+ if(CollectionUtils.isEmpty(updateChannels) && CollectionUtils.isEmpty(addChannels) ){
+ logger.info("閫氶亾鏇存柊锛屾暟鎹负绌�={}" , deviceChannelList);
+ return false;
+ }
+ try {
+ int limitCount = 300;
+ boolean result = false;
+ if (addChannels.size() > 0) {
+ if (addChannels.size() > limitCount) {
+ for (int i = 0; i < addChannels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > addChannels.size()) {
+ toIndex = addChannels.size();
+ }
+ result = result || deviceChannelMapper.batchAddOrUpdate(addChannels.subList(i, toIndex)) < 0;
+ }
+ }else {
+ result = result || deviceChannelMapper.batchAddOrUpdate(addChannels) < 0;
+ }
+ }
+ if (updateChannels.size() > 0) {
+ if (updateChannels.size() > limitCount) {
+ for (int i = 0; i < updateChannels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > updateChannels.size()) {
+ toIndex = updateChannels.size();
+ }
+ result = result || deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex)) < 0;
+ }
+ }else {
+ result = result || deviceChannelMapper.batchUpdate(updateChannels) < 0;
+ }
+ }
+ if (result) {
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ }else {
+ //鎵嬪姩鎻愪氦
+ dataSourceTransactionManager.commit(transactionStatus);
+ }
+ return true;
+ }catch (Exception e) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
+ dataSourceTransactionManager.rollback(transactionStatus);
+ return false;
+ }
}
@Override
@@ -231,31 +356,36 @@
PageHelper.startPage(page, count);
List<DeviceChannel> all;
if (catalogUnderDevice != null && catalogUnderDevice) {
- all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online);
+ all = deviceChannelMapper.queryChannels(deviceId, deviceId, query, hasSubChannel, online,null);
// 娴峰悍璁惧鐨刾arentId鏄疭IP id
- List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, sipConfig.getId(), query, hasSubChannel, online);
+ List<DeviceChannel> deviceChannels = deviceChannelMapper.queryChannels(deviceId, sipConfig.getId(), query, hasSubChannel, online,null);
all.addAll(deviceChannels);
}else {
- all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online);
+ all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online,null);
}
return new PageInfo<>(all);
}
@Override
- public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
- return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit);
+ 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) {
- return deviceChannelMapper.queryChannels(deviceId, null,null, null, null);
+ 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
public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
PageHelper.startPage(page, count);
- List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, query, hasSubChannel, online);
+ List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, query, hasSubChannel, online,null);
return new PageInfo<>(all);
}
@@ -278,9 +408,9 @@
* @return PageInfo<Device> 鍒嗛〉璁惧瀵硅薄鏁扮粍
*/
@Override
- public PageInfo<Device> queryVideoDeviceList(int page, int count) {
+ public PageInfo<Device> queryVideoDeviceList(int page, int count,Boolean online) {
PageHelper.startPage(page, count);
- List<Device> all = deviceMapper.getDevices();
+ List<Device> all = deviceMapper.getDevices(online);
return new PageInfo<>(all);
}
@@ -290,9 +420,9 @@
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
@Override
- public List<Device> queryVideoDeviceList() {
+ public List<Device> queryVideoDeviceList(Boolean online) {
- List<Device> deviceList = deviceMapper.getDevices();
+ List<Device> deviceList = deviceMapper.getDevices(online);
return deviceList;
}
@@ -311,9 +441,6 @@
*/
@Override
public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
- if (mobilePosition.getDeviceId().equals(mobilePosition.getChannelId())) {
- mobilePosition.setChannelId(null);
- }
return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
}
@@ -395,6 +522,16 @@
}
@Override
+ public List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel() {
+ return platformMapper.queryEnablePlatformListWithAsMessageChannel();
+ }
+
+ @Override
+ public List<Device> queryDeviceWithAsMessageChannel() {
+ return deviceMapper.queryDeviceWithAsMessageChannel();
+ }
+
+ @Override
public void outlineForAllParentPlatform() {
platformMapper.outlineForAllParentPlatform();
}
@@ -471,6 +608,20 @@
}
+ @Override
+ public Device queryDeviceInfoByPlatformIdAndChannelId(String platformId, String channelId) {
+ List<Device> devices = platformChannelMapper.queryDeviceInfoByPlatformIdAndChannelId(platformId, channelId);
+ if (devices.size() > 1) {
+ // 鍑虹幇闀垮害澶т簬0鐨勬椂鍊欒偗瀹氭槸鍥芥爣閫氶亾鐨処D閲嶅浜�
+ logger.warn("鍥芥爣ID瀛樺湪閲嶅锛歿}", channelId);
+ }
+ if (devices.size() == 0) {
+ return null;
+ }else {
+ return devices.get(0);
+ }
+ }
+
/**
* 鏌ヨ鏈�鏂扮Щ鍔ㄤ綅缃�
* @param deviceId
--
Gitblit v1.8.0