diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index 519a2dd42..2feff1e81 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -594,6 +594,7 @@ public class DayDataServiceImpl implements DayDataService { @Override @Transactional(rollbackFor = {Exception.class}) + @Deprecated public void dataToDayHandler(CalculatedParam calculatedParam) { log.info(LocalDateTime.now() + "data表转day开始=====》"); //influxdb实体 @@ -646,7 +647,7 @@ public class DayDataServiceImpl implements DayDataService { List lineIds = calculatedParam.getIdList(); //河北数据量较大,以尺寸20分片 - List> pendingIds = ListUtils.partition(lineIds,1); + List> pendingIds = ListUtils.partition(lineIds,5); String beginDay =LocalDateTimeUtil.format(LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATETIME_PATTERN); String endDay = LocalDateTimeUtil.format(LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATETIME_PATTERN); for (List pendingId : pendingIds) { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java index f7b686fc3..bf50c566a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateServiceImpl.java @@ -82,7 +82,7 @@ public class LimitRateServiceImpl extends MppServiceImpl overLimitList = commTerminalGeneralClient.getAllLineOverLimit().getData(); Map> overLimitMap = overLimitList.stream().collect(Collectors.groupingBy(Overlimit::getId)); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,20); + List> pendingIds = ListUtils.partition(lineIds,1); for (List pendingId : pendingIds) { list1.addAll(getAllTime(pendingId, startTime, endTime)); list2.addAll(getFlickerAllTime(pendingId, startTime, endTime)); @@ -108,15 +108,18 @@ public class LimitRateServiceImpl extends MppServiceImpl> map9 = list9.stream().collect(Collectors.groupingBy(DataV::getLineId)); Map> map10 = list10.stream().collect(Collectors.groupingBy(DataV::getLineId)); Map> map11 = list11.stream().collect(Collectors.groupingBy(DataPlt::getLineId)); - for (String item : lineIds) { - List result = getData(overLimitMap.get(item).get(0), map1.get(item), map2.get(item), map3.get(item), map4.get(item), map5.get(item), map6.get(item), map7.get(item), map8.get(item), map9.get(item), map10.get(item), map11.get(item)); - List collect = result.stream().map(t -> { - RStatLimitRateDPO po = new RStatLimitRateDPO(); - NjcnBeanUtil.copyPropertiesIgnoreCase(t, po); - po.setTime(LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)); - return po; - }).collect(Collectors.toList()); - list.addAll(collect); + + for (List pendingId : pendingIds) { + for (String item : pendingId) { + List result = getData(overLimitMap.get(item).get(0), map1.get(item), map2.get(item), map3.get(item), map4.get(item), map5.get(item), map6.get(item), map7.get(item), map8.get(item), map9.get(item), map10.get(item), map11.get(item)); + List collect = result.stream().map(t -> { + RStatLimitRateDPO po = new RStatLimitRateDPO(); + NjcnBeanUtil.copyPropertiesIgnoreCase(t, po); + po.setTime(LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)); + return po; + }).collect(Collectors.toList()); + list.addAll(collect); + } } if (!CollectionUtils.isEmpty(list)){ /*插入mysql*/