From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001 From: xubinbin <1323875150@qq.com> Date: 星期二, 12 十二月 2023 17:09:04 +0800 Subject: [PATCH] bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195 --- src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 82 insertions(+), 29 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 1f6bb62..af9454d 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java @@ -74,6 +74,9 @@ private PlatformChannelMapper platformChannelMapper; @Autowired + private PlatformCatalogMapper platformCatalogMapper; + + @Autowired private StreamProxyMapper streamProxyMapper; @Autowired @@ -126,6 +129,7 @@ List<DeviceChannel> updateChannels = new ArrayList<>(); List<DeviceChannel> addChannels = new ArrayList<>(); + List<DeviceChannel> deleteChannels = new ArrayList<>(); StringBuilder stringBuilder = new StringBuilder(); Map<String, Integer> subContMap = new HashMap<>(); @@ -156,6 +160,7 @@ deviceChannel.setUpdateTime(DateUtil.getNow()); addChannels.add(deviceChannel); } + allChannelMap.remove(deviceChannel.getChannelId()); channels.add(deviceChannel); if (!ObjectUtils.isEmpty(deviceChannel.getParentId())) { if (subContMap.get(deviceChannel.getParentId()) == null) { @@ -166,7 +171,8 @@ } } } - if (channels.size() > 0) { + deleteChannels.addAll(allChannelMap.values()); + if (!channels.isEmpty()) { for (DeviceChannel channel : channels) { if (subContMap.get(channel.getChannelId()) != null){ Integer count = subContMap.get(channel.getChannelId()); @@ -186,11 +192,9 @@ return false; } try { - int cleanChannelsResult = deviceChannelMapper.cleanChannelsNotInList(deviceId, channels); - - int limitCount = 300; - boolean result = cleanChannelsResult < 0; - if (!result && addChannels.size() > 0) { + int limitCount = 50; + boolean result = false; + if (!result && !addChannels.isEmpty()) { if (addChannels.size() > limitCount) { for (int i = 0; i < addChannels.size(); i += limitCount) { int toIndex = i + limitCount; @@ -203,7 +207,7 @@ result = result || deviceChannelMapper.batchAdd(addChannels) < 0; } } - if (!result && updateChannels.size() > 0) { + if (!result && !updateChannels.isEmpty()) { if (updateChannels.size() > limitCount) { for (int i = 0; i < updateChannels.size(); i += limitCount) { int toIndex = i + limitCount; @@ -214,6 +218,20 @@ } }else { result = result || deviceChannelMapper.batchUpdate(updateChannels) < 0; + } + } + if (!result && !deleteChannels.isEmpty()) { + System.out.println("鍒犻櫎锛� " + deleteChannels.size()); + if (deleteChannels.size() > limitCount) { + for (int i = 0; i < deleteChannels.size(); i += limitCount) { + int toIndex = i + limitCount; + if (i + limitCount > deleteChannels.size()) { + toIndex = deleteChannels.size(); + } + result = result || deviceChannelMapper.batchDel(deleteChannels.subList(i, toIndex)) < 0; + } + }else { + result = result || deviceChannelMapper.batchDel(deleteChannels) < 0; } } @@ -244,12 +262,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) { @@ -258,15 +276,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()); - deviceChannel.setUpdateTime(DateUtil.getNow()); + 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); @@ -279,15 +306,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())); } @@ -298,12 +318,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) { @@ -312,10 +332,10 @@ 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) { @@ -331,13 +351,12 @@ 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); @@ -899,9 +918,43 @@ eventPublisher.catalogEventPublish(platformId, deviceChannelList, CatalogEvent.DEL); } int delChannelresult = platformChannelMapper.delByCatalogId(platformId, id); + // 鏌ョ湅鏄惁瀛樺湪瀛愮洰褰曪紝濡傛灉瀛樺湪涓�骞跺垹闄� + List<String> allChildCatalog = getAllChildCatalog(id, platformId); + if (!allChildCatalog.isEmpty()) { + int limitCount = 50; + if (allChildCatalog.size() > limitCount) { + for (int i = 0; i < allChildCatalog.size(); i += limitCount) { + int toIndex = i + limitCount; + if (i + limitCount > allChildCatalog.size()) { + toIndex = allChildCatalog.size(); + } + delChannelresult += platformCatalogMapper.deleteAll(platformId, allChildCatalog.subList(i, toIndex)); + } + }else { + delChannelresult += platformCatalogMapper.deleteAll(platformId, allChildCatalog); + } + } return delresult + delChannelresult + delStreamresult; } + private List<String> getAllChildCatalog(String id, String platformId) { + List<String> catalogList = platformCatalogMapper.queryCatalogFromParent(id, platformId); + List<String> catalogListChild = new ArrayList<>(); + if (catalogList != null && !catalogList.isEmpty()) { + for (String childId : catalogList) { + List<String> allChildCatalog = getAllChildCatalog(childId, platformId); + if (allChildCatalog != null && !allChildCatalog.isEmpty()) { + catalogListChild.addAll(allChildCatalog); + } + + } + } + if (!catalogListChild.isEmpty()) { + catalogList.addAll(catalogListChild); + } + return catalogList; + } + @Override public int updateCatalog(PlatformCatalog platformCatalog) { -- Gitblit v1.8.0