From 17ea37506eb736077f911c6d76e041db04e01b7e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 七月 2023 09:06:49 +0800
Subject: [PATCH] 修复端口分配的并发问题
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
index 41b55dd..f315c45 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
@@ -10,6 +10,7 @@
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* @author lin
@@ -98,7 +100,7 @@
HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
Device device = deviceMapper.getDeviceByDeviceId(deviceId);
if (channels != null && channels.size() > 0) {
- List<DeviceChannel> channelList = channelMapper.queryChannels(deviceId, null, null, null, null);
+ List<DeviceChannel> channelList = channelMapper.queryChannels(deviceId, null, null, null, null,null);
if (channelList.size() == 0) {
for (DeviceChannel channel : channels) {
channel.setDeviceId(deviceId);
@@ -168,4 +170,86 @@
public ResourceBaceInfo getOverview() {
return channelMapper.getOverview();
}
+
+
+ @Override
+ public List<ChannelReduce> queryAllChannelList(String platformId) {
+ return channelMapper.queryChannelListInAll(null, null, null, platformId, null);
+ }
+
+ @Override
+ public boolean updateAllGps(Device device) {
+ List<DeviceChannel> deviceChannels = channelMapper.getChannelsWithoutTransform(device.getDeviceId());
+ List<DeviceChannel> result = new CopyOnWriteArrayList<>();
+ if (deviceChannels.size() == 0) {
+ return true;
+ }
+ String now = DateUtil.getNow();
+ deviceChannels.parallelStream().forEach(deviceChannel -> {
+ deviceChannel.setUpdateTime(now);
+ result.add(updateGps(deviceChannel, device));
+ });
+ int limitCount = 300;
+ if (result.size() > limitCount) {
+ for (int i = 0; i < result.size(); i += limitCount) {
+ int toIndex = i + limitCount;
+ if (i + limitCount > result.size()) {
+ toIndex = result.size();
+ }
+ channelMapper.batchUpdate(result.subList(i, toIndex));
+ }
+ }else {
+ channelMapper.batchUpdate(result);
+ }
+
+ return true;
+ }
+
+ @Override
+ public List<Device> getDeviceByChannelId(String channelId) {
+
+ return channelMapper.getDeviceByChannelId(channelId);
+ }
+
+ @Override
+ public int deleteChannels(List<DeviceChannel> deleteChannelList) {
+ return channelMapper.batchDel(deleteChannelList);
+ }
+
+ @Override
+ public int channelsOnline(List<DeviceChannel> channels) {
+ return channelMapper.batchOnline(channels);
+ }
+
+ @Override
+ public int channelsOffline(List<DeviceChannel> channels) {
+ return channelMapper.batchOffline(channels);
+ }
+
+ @Override
+ public DeviceChannel getOne(String deviceId, String channelId){
+ return channelMapper.queryChannel(deviceId, channelId);
+ }
+
+ @Override
+ public void batchUpdateChannel(List<DeviceChannel> channels) {
+ channelMapper.batchUpdate(channels);
+ for (DeviceChannel channel : channels) {
+ if (channel.getParentId() != null) {
+ channelMapper.updateChannelSubCount(channel.getDeviceId(), channel.getParentId());
+ }
+ }
+ }
+
+ @Override
+ public void batchAddChannel(List<DeviceChannel> channels) {
+ channelMapper.batchAdd(channels);
+ for (DeviceChannel channel : channels) {
+ if (channel.getParentId() != null) {
+ channelMapper.updateChannelSubCount(channel.getDeviceId(), channel.getParentId());
+ }
+ }
+ }
+
+
}
--
Gitblit v1.8.0