From cf23816c80771c9e22bb50d0d89feb34d2edca79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 一月 2022 16:42:58 +0800
Subject: [PATCH] 恢复合并的limit值
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index d381574..2f4c966 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
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.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.*;
@@ -23,10 +24,7 @@
import org.springframework.util.StringUtils;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @description:瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
@@ -226,21 +224,41 @@
@Override
public boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList) {
TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ // 鏁版嵁鍘婚噸
+ List<DeviceChannel> channels = new ArrayList<>();
+ StringBuilder stringBuilder = new StringBuilder();
+ if (deviceChannelList.size() > 1) {
+ // 鏁版嵁鍘婚噸
+ Set<String> gbIdSet = new HashSet<>();
+ for (DeviceChannel deviceChannel : deviceChannelList) {
+ if (!gbIdSet.contains(deviceChannel.getChannelId())) {
+ gbIdSet.add(deviceChannel.getChannelId());
+ channels.add(deviceChannel);
+ }else {
+ stringBuilder.append(deviceChannel.getChannelId() + ",");
+ }
+ }
+ }else {
+ channels = deviceChannelList;
+ }
+ if (stringBuilder.length() > 0) {
+ logger.debug("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
+ }
try {
int cleanChannelsResult = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
int limitCount = 300;
- boolean result = cleanChannelsResult <0;
- if (!result && deviceChannelList.size() > 0) {
- if (deviceChannelList.size() > limitCount) {
- for (int i = 0; i < deviceChannelList.size(); i += limitCount) {
+ boolean result = cleanChannelsResult < 0;
+ if (!result && channels.size() > 0) {
+ if (channels.size() > limitCount) {
+ for (int i = 0; i < channels.size(); i += limitCount) {
int toIndex = i + limitCount;
- if (i + limitCount > deviceChannelList.size()) {
- toIndex = deviceChannelList.size();
+ if (i + limitCount > channels.size()) {
+ toIndex = channels.size();
}
- result = result || deviceChannelMapper.batchAdd(deviceChannelList.subList(i, toIndex)) < 0;
+ result = result || deviceChannelMapper.batchAdd(channels.subList(i, toIndex)) < 0;
}
}else {
- result = result || deviceChannelMapper.batchAdd(deviceChannelList) < 0;
+ result = result || deviceChannelMapper.batchAdd(channels) < 0;
}
}
if (result) {
@@ -898,4 +916,9 @@
}
return 0;
}
+
+ @Override
+ public int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfos) {
+ return gbStreamMapper.updateStreamGPS(gpsMsgInfos);
+ }
}
--
Gitblit v1.8.0