From b68898b2240a8633d864b6d059fd23280f72d0d4 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 19 Jan 2024 13:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8B?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/Impl/line/DayDataServiceImpl.java   |  3 ++-
 .../mysql/Impl/line/LimitRateServiceImpl.java | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

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<String> lineIds = calculatedParam.getIdList();
         //河北数据量较大，以尺寸20分片
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,1);
+        List<List<String>> 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<String> 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<LimitRatePOMapper, Limi
         List<Overlimit> overLimitList = commTerminalGeneralClient.getAllLineOverLimit().getData();
         Map<String,List<Overlimit>> overLimitMap = overLimitList.stream().collect(Collectors.groupingBy(Overlimit::getId));
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,1);
         for (List<String> pendingId : pendingIds) {
             list1.addAll(getAllTime(pendingId, startTime, endTime));
             list2.addAll(getFlickerAllTime(pendingId, startTime, endTime));
@@ -108,15 +108,18 @@ public class LimitRateServiceImpl extends MppServiceImpl<LimitRatePOMapper, Limi
         Map<String,List<DataV>> map9 = list9.stream().collect(Collectors.groupingBy(DataV::getLineId));
         Map<String,List<DataV>> map10 = list10.stream().collect(Collectors.groupingBy(DataV::getLineId));
         Map<String,List<DataPlt>> map11 = list11.stream().collect(Collectors.groupingBy(DataPlt::getLineId));
-        for (String item : lineIds) {
-            List<LimitRate> 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<RStatLimitRateDPO> 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<String> pendingId : pendingIds) {
+            for (String item : pendingId) {
+                List<LimitRate> 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<RStatLimitRateDPO> 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*/