From d05bce8f7ffb58fe6c9d386b96816b842d6c898d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 12 九月 2023 15:32:17 +0800
Subject: [PATCH] 修复对接金仓数据库中的问题
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 126 +++++++++++++++++++++++++++++-------------
1 files changed, 87 insertions(+), 39 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..32c2564 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;
@@ -122,6 +123,9 @@
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
// 鏁版嵁鍘婚噸
List<DeviceChannel> channels = new ArrayList<>();
+
+ List<DeviceChannel> updateChannels = new ArrayList<>();
+ List<DeviceChannel> addChannels = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
Map<String, Integer> subContMap = new HashMap<>();
if (deviceChannelList.size() > 0) {
@@ -130,18 +134,22 @@
for (DeviceChannel deviceChannel : deviceChannelList) {
if (!gbIdSet.contains(deviceChannel.getChannelId())) {
gbIdSet.add(deviceChannel.getChannelId());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
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);
});
}
-
}
+ updateChannels.add(deviceChannel);
+ }else {
+ deviceChannel.setCreateTime(DateUtil.getNow());
+ addChannels.add(deviceChannel);
}
channels.add(deviceChannel);
if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
@@ -173,22 +181,47 @@
return false;
}
try {
- int cleanChannelsResult = deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
- int limitCount = 300;
+ int limitCount = 50;
+ int cleanChannelsResult = 0;
+ if (channels.size() > limitCount) {
+ for (int i = 0; i < channels.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > channels.size()) {
+ toIndex = channels.size();
+ }
+ cleanChannelsResult += this.deviceChannelMapper.cleanChannelsNotInList(deviceId, channels.subList(i, toIndex));
+ }
+ } else {
+ cleanChannelsResult = this.deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
+ }
boolean result = cleanChannelsResult < 0;
- if (!result && channels.size() > 0) {
- if (channels.size() > limitCount) {
- for (int i = 0; i < channels.size(); i += limitCount) {
+ if (!result && addChannels.size() > 0) {
+ if (addChannels.size() > limitCount) {
+ for (int i = 0; i < addChannels.size(); i += limitCount) {
int toIndex = i + limitCount;
- if (i + limitCount > channels.size()) {
- toIndex = channels.size();
+ if (i + limitCount > addChannels.size()) {
+ toIndex = addChannels.size();
}
- result = result || deviceChannelMapper.batchAdd(channels.subList(i, toIndex)) < 0;
+ result = result || deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex)) < 0;
}
}else {
- result = result || deviceChannelMapper.batchAdd(channels) < 0;
+ result = result || deviceChannelMapper.batchAdd(addChannels) < 0;
}
}
+ if (!result && 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);
@@ -196,7 +229,7 @@
dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
return true;
}catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
return false;
}
@@ -216,12 +249,12 @@
allChannelMap.put(deviceChannel.getChannelId(), deviceChannel);
}
}
- List<DeviceChannel> addChannels = new ArrayList<>();
- List<DeviceChannel> updateChannels = new ArrayList<>();
-
-
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
// 鏁版嵁鍘婚噸
+ List<DeviceChannel> channels = new ArrayList<>();
+
+ List<DeviceChannel> updateChannels = new ArrayList<>();
+ List<DeviceChannel> addChannels = new ArrayList<>();
StringBuilder stringBuilder = new StringBuilder();
Map<String, Integer> subContMap = new HashMap<>();
if (deviceChannelList.size() > 0) {
@@ -230,13 +263,24 @@
for (DeviceChannel deviceChannel : deviceChannelList) {
if (!gbIdSet.contains(deviceChannel.getChannelId())) {
gbIdSet.add(deviceChannel.getChannelId());
+ deviceChannel.setUpdateTime(DateUtil.getNow());
if (allChannelMap.containsKey(deviceChannel.getChannelId())) {
deviceChannel.setStreamId(allChannelMap.get(deviceChannel.getChannelId()).getStreamId());
deviceChannel.setHasAudio(allChannelMap.get(deviceChannel.getChannelId()).isHasAudio());
+ 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.isStatus()?CatalogEvent.ON:CatalogEvent.OFF);
+ });
+ }
+ }
updateChannels.add(deviceChannel);
}else {
+ deviceChannel.setCreateTime(DateUtil.getNow());
addChannels.add(deviceChannel);
}
+ channels.add(deviceChannel);
if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) {
if (subContMap.get(deviceChannel.getParentId()) == null) {
subContMap.put(deviceChannel.getParentId(), 1);
@@ -249,15 +293,8 @@
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 (channels.size() > 0) {
+ for (DeviceChannel channel : channels) {
if (subContMap.get(channel.getChannelId()) != null){
channel.setSubCount(subContMap.get(channel.getChannelId()));
}
@@ -268,12 +305,12 @@
if (stringBuilder.length() > 0) {
logger.info("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
}
- if(CollectionUtils.isEmpty(updateChannels) && CollectionUtils.isEmpty(addChannels) ){
- logger.info("閫氶亾鏇存柊锛屾暟鎹负绌�={}" , deviceChannelList);
+ if(CollectionUtils.isEmpty(channels)){
+ logger.info("閫氶亾閲嶈锛屾暟鎹负绌�={}" , deviceChannelList);
return false;
}
try {
- int limitCount = 300;
+ int limitCount = 50;
boolean result = false;
if (addChannels.size() > 0) {
if (addChannels.size() > limitCount) {
@@ -301,16 +338,15 @@
result = result || deviceChannelMapper.batchUpdate(updateChannels) < 0;
}
}
+
if (result) {
//浜嬪姟鍥炴粴
dataSourceTransactionManager.rollback(transactionStatus);
- }else {
- //鎵嬪姩鎻愪氦
- dataSourceTransactionManager.commit(transactionStatus);
}
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
return true;
}catch (Exception e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
dataSourceTransactionManager.rollback(transactionStatus);
return false;
}
@@ -364,14 +400,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 +474,6 @@
*/
@Override
public synchronized boolean insertMobilePosition(MobilePosition mobilePosition) {
- if (mobilePosition.getDeviceId().equals(mobilePosition.getChannelId())) {
- mobilePosition.setChannelId(null);
- }
return deviceMobilePositionMapper.insertNewPosition(mobilePosition) > 0;
}
@@ -514,6 +552,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
@@ -904,7 +952,7 @@
deviceChannel.setLatitude(0.0);
deviceChannel.setDeviceId(platform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro");
- deviceChannel.setStatus(1);
+ deviceChannel.setStatus(true);
deviceChannel.setParental(1);
deviceChannel.setRegisterWay(1);
--
Gitblit v1.8.0