河北超高压算法调整

pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java

@@ -33,9 +33,9 @@ import java.util.concurrent.TimeUnit;
 @Data
 public class InfluxDbUtils {
     static OkHttpClient.Builder client = new OkHttpClient.Builder()
-            .connectTimeout(10000,TimeUnit.SECONDS)
+            .connectTimeout(1000,TimeUnit.SECONDS)
-            .readTimeout(10000, TimeUnit.SECONDS)
+            .readTimeout(1000, TimeUnit.SECONDS)
-            .writeTimeout(10000, TimeUnit.SECONDS);
+            .writeTimeout(1000, TimeUnit.SECONDS);
     private static final int FRACTION_MIN_WIDTH = 0;
     private static final int FRACTION_MAX_WIDTH = 9;
     private static final boolean ADD_DECIMAL_POINT = true;

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java

@@ -116,7 +116,7 @@ public class RMpDevEvaluateDetailPOServiceImpl extends MppServiceImpl<RMpDevEval
         List<String> deviceList = new ArrayList<>();
         List<String> lineIds = calculatedParam.getIdList();
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             //获取监测点评价详情
             LambdaQueryWrapper<ROperatingMonitorDPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java

@@ -109,7 +109,7 @@ public class RMpMonitorAlarmCountMServiceImpl extends MppServiceImpl<RMpMonitorA
         DateTime beginMonth = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime endMonth = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<RMpMonitorAlarmCountMDTO> monthList = rMpTargetWarnDMapper.getDate(beginMonth,endMonth,pendingId);
             if (!CollectionUtils.isEmpty(monthList)){

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java

@@ -83,7 +83,7 @@ public class RMpTargetWarnDServiceImpl extends MppServiceImpl<RMpTargetWarnDMapp
         log.info(LocalDateTime.now()+"===>监测点指标告警日统计算法开始");
         List<String> lineIds = calculatedParam.getIdList();
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<RMpTargetWarnDPO> list = getData(calculatedParam.getDataDate(),pendingId);
             if (CollectionUtil.isNotEmpty(list)){

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java

@@ -59,7 +59,7 @@ public class RStatDevSignalDPOServiceImpl extends MppServiceImpl<RStatDevSignalD
         DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.RUNNING.getCode()).getData();
         List<String> lineIds = calculatedParam.getIdList();
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             //获取监测点评价详情
             LambdaQueryWrapper<RMpMonitorEvaluateDPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java

@@ -90,7 +90,7 @@ public class AlarmDetailServiceImpl extends MppServiceImpl<AlarmMapper, RMpTarge
         String nowDay = calculatedParam.getDataDate();
         String yesterday = PublicUtil.getYesterday(nowDay);
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<RMpTargetDiffDPO> intersectionList = diffData(nowDay,yesterday,pendingId);
             if (!CollectionUtils.isEmpty(intersectionList)){

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java

@@ -144,8 +144,8 @@ public class DayDataServiceImpl implements DayDataService {
         List<DayPlt> dayPltList = new ArrayList<>();
 
         List<String> lineIds = calculatedParam.getIdList();
-        //以尺寸100分片
+        //河北数据量较大，以尺寸20分片
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         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) {

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java

@@ -108,7 +108,7 @@ public class IntegrityServiceImpl extends MppServiceImpl<RStatIntegrityDMapper,
                 DatePattern.NORM_DATETIME_PATTERN
         );
         //以尺寸100分片
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<LineDevGetDTO> lineDevGetDTOList = commTerminalGeneralClient.getMonitorDetailList(pendingId).getData();
             List<MeasurementCount> countList = this.getMeasurementCount(pendingId,beginDay,endDay);

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,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             list1.addAll(getAllTime(pendingId, startTime, endTime));
             list2.addAll(getFlickerAllTime(pendingId, startTime, endTime));

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java

@@ -111,7 +111,7 @@ public class LimitTargetServiceImpl extends MppServiceImpl<RStatLimitTargetDMapp
         List<String> lineIds = calculatedParam.getIdList();
         LocalDate dateOut = LocalDate.parse(calculatedParam.getDataDate(),DatePattern.NORM_DATE_FORMATTER);
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             limitRateData.addAll(getLimitRateDataFromMysql(pendingId,startTime,endTime));
         }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java

@@ -34,7 +34,7 @@ public class RMpPartHarmonicDetailDServiceImpl extends MppServiceImpl<RMpPartHar
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表1开始执行");
         List<String> lineIds = calculatedParam.getIdList();
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<RMpPartHarmonicDetailD> list = getData(calculatedParam.getDataDate(),pendingId);
             if (CollectionUtil.isNotEmpty(list)){

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java

@@ -32,7 +32,7 @@ public class RMpSurplusHarmonicDetailDServiceImpl extends MppServiceImpl<RMpSurp
         log.info(LocalDateTime.now()+"===>监测点稳态指标超标明细日表2开始执行");
         List<String> lineIds = calculatedParam.getIdList();
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<RMpSurplusHarmonicDetailD> result = this.baseMapper.getHarmonicDetailDayTwo(calculatedParam.getDataDate(),pendingId);
             if (CollectionUtil.isNotEmpty(result)){

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java

@@ -33,7 +33,7 @@ public class RMpVThdServiceImpl extends MppServiceImpl<RMpVThdMapper, RMpVThd> i
         log.info(LocalDateTime.now()+"===>监测点谐波畸变率开始执行");
         List<String> lineIds = calculatedParam.getIdList();
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             List<RMpVThd> result = this.baseMapper.getVThdData(calculatedParam.getDataDate(),pendingId);
             if (CollectionUtil.isNotEmpty(result)){

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelDServiceImpl.java

@@ -55,7 +55,7 @@ public class RMpBenchmarkLevelDServiceImpl extends MppServiceImpl<RMpBenchmarkLe
         DateTime beginDay = DateUtil.beginOfDay(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime endDay = DateUtil.endOfDay(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             //查询电压表
             vList.addAll(rStatDataVDMapper.getBenchmarkLevel(beginDay,endDay,pendingId));

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelMServiceImpl.java

@@ -50,7 +50,7 @@ public class RMpBenchmarkLevelMServiceImpl extends MppServiceImpl<RMpBenchmarkLe
         DateTime beginMonth = DateUtil.beginOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime endMonth = DateUtil.endOfMonth(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             LambdaQueryWrapper<RMpBenchmarkLevelD> lambdaQueryWrapper = new LambdaQueryWrapper<RMpBenchmarkLevelD>();
             lambdaQueryWrapper.in(RMpBenchmarkLevelD::getMeasurementPointId,pendingId)

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelQServiceImpl.java

@@ -48,7 +48,7 @@ public class RMpBenchmarkLevelQServiceImpl extends MppServiceImpl<RMpBenchmarkLe
         DateTime beginMonth = DateUtil.beginOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime endMonth = DateUtil.endOfQuarter(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             LambdaQueryWrapper<RMpBenchmarkLevelD> lambdaQueryWrapper = new LambdaQueryWrapper<RMpBenchmarkLevelD>();
             lambdaQueryWrapper.in(RMpBenchmarkLevelD::getMeasurementPointId,pendingId)

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelYServiceImpl.java

@@ -48,7 +48,7 @@ public class RMpBenchmarkLevelYServiceImpl extends MppServiceImpl<RMpBenchmarkLe
         DateTime beginMonth = DateUtil.beginOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         DateTime endMonth = DateUtil.endOfYear(DateUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN));
         //以尺寸100分片,查询数据
-        List<List<String>> pendingIds =  ListUtils.partition(lineIds,100);
+        List<List<String>> pendingIds =  ListUtils.partition(lineIds,20);
         for (List<String> pendingId : pendingIds) {
             LambdaQueryWrapper<RMpBenchmarkLevelD> lambdaQueryWrapper = new LambdaQueryWrapper<RMpBenchmarkLevelD>();
             lambdaQueryWrapper.in(RMpBenchmarkLevelD::getMeasurementPointId,pendingId)