From d05bce8f7ffb58fe6c9d386b96816b842d6c898d Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 12 Sep 2023 15:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E6=8E=A5=E9=87=91?= =?UTF-8?q?=E4=BB=93=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DeviceChannelServiceImpl.java | 6 +- .../impl/PlatformChannelServiceImpl.java | 2 +- .../iot/vmp/storager/dao/GbStreamMapper.java | 2 +- .../storager/dao/PlatformGbStreamMapper.java | 2 +- .../impl/VideoManagerStorageImpl.java | 61 +++++++++++-------- 5 files changed, 41 insertions(+), 32 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 45405f70..faf196ec 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 @@ -50,8 +50,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { device = deviceMapper.getDeviceByDeviceId(deviceChannel.getDeviceId()); } - - if ("WGS84".equals(device.getGeoCoordSys())) { deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude()); deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude()); @@ -143,7 +141,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { } } } - int limitCount = 300; + int limitCount = 50; if (addChannels.size() > 0) { if (addChannels.size() > limitCount) { for (int i = 0; i < addChannels.size(); i += limitCount) { @@ -201,7 +199,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { deviceChannel.setUpdateTime(now); result.add(updateGps(deviceChannel, device)); }); - int limitCount = 300; + int limitCount = 50; if (result.size() > limitCount) { for (int i = 0; i < result.size(); i += limitCount) { int toIndex = i + limitCount; diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java index 7d827d73..58f6c942 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java @@ -82,7 +82,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService { int allCount = 0; boolean result = false; TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); - int limitCount = 300; + int limitCount = 50; if (channelReducesToAdd.size() > 0) { if (channelReducesToAdd.size() > limitCount) { for (int i = 0; i < channelReducesToAdd.size(); i += limitCount) { diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java index e313acea..414181ee 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java @@ -14,7 +14,7 @@ import java.util.List; @Repository public interface GbStreamMapper { - @Insert("REPLACE INTO wvp_gb_stream (app, stream, gb_id, name, " + + @Insert("INSERT INTO wvp_gb_stream (app, stream, gb_id, name, " + "longitude, latitude, stream_type,media_server_id,create_time) VALUES" + "(#{app}, #{stream}, #{gbId}, #{name}, " + "#{longitude}, #{latitude}, #{streamType}, " + diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java index 0b198554..95857b48 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java @@ -16,7 +16,7 @@ import java.util.List; @Repository public interface PlatformGbStreamMapper { - @Insert("REPLACE INTO wvp_platform_gb_stream (gb_stream_id, platform_id, catalog_id) VALUES" + + @Insert("INSERT INTO wvp_platform_gb_stream (gb_stream_id, platform_id, catalog_id) VALUES" + "( #{gbStreamId}, #{platformId}, #{catalogId})") int add(PlatformGbStream platformGbStream); 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 f73339d1..32c2564c 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 @@ -181,9 +181,19 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { 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 && addChannels.size() > 0) { if (addChannels.size() > limitCount) { @@ -239,12 +249,12 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { allChannelMap.put(deviceChannel.getChannelId(), deviceChannel); } } - List addChannels = new ArrayList<>(); - List updateChannels = new ArrayList<>(); - - TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition); // 数据去重 + List channels = new ArrayList<>(); + + List updateChannels = new ArrayList<>(); + List addChannels = new ArrayList<>(); StringBuilder stringBuilder = new StringBuilder(); Map subContMap = new HashMap<>(); if (deviceChannelList.size() > 0) { @@ -253,15 +263,24 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { 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()); - deviceChannel.setUpdateTime(DateUtil.getNow()); + if (allChannelMap.get(deviceChannel.getChannelId()).isStatus() !=deviceChannel.isStatus()){ + List 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); @@ -274,15 +293,8 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { 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())); } @@ -293,12 +305,12 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { 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) { @@ -307,10 +319,10 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { if (i + limitCount > addChannels.size()) { toIndex = addChannels.size(); } - result = result || deviceChannelMapper.batchAddOrUpdate(addChannels.subList(i, toIndex)) < 0; + result = result || deviceChannelMapper.batchAdd(addChannels.subList(i, toIndex)) < 0; } }else { - result = result || deviceChannelMapper.batchAddOrUpdate(addChannels) < 0; + result = result || deviceChannelMapper.batchAdd(addChannels) < 0; } } if (updateChannels.size() > 0) { @@ -326,13 +338,12 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { result = result || deviceChannelMapper.batchUpdate(updateChannels) < 0; } } + if (result) { //事务回滚 dataSourceTransactionManager.rollback(transactionStatus); - }else { - //手动提交 - dataSourceTransactionManager.commit(transactionStatus); } + dataSourceTransactionManager.commit(transactionStatus); //手动提交 return true; }catch (Exception e) { logger.error("未处理的异常 ", e);