diff --git a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java b/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java index 0cd640e6a..0e2266cdb 100644 --- a/pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/InfluxDbUtils.java +++ b/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) - .readTimeout(10000, TimeUnit.SECONDS) - .writeTimeout(10000, TimeUnit.SECONDS); + .connectTimeout(1000,TimeUnit.SECONDS) + .readTimeout(1000, 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; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java index f178c7d77..36a2bc4f3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpDevEvaluateDetailPOServiceImpl.java +++ b/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 deviceList = new ArrayList<>(); List lineIds = calculatedParam.getIdList(); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { //获取监测点评价详情 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java index 6670a6bdf..49d13ed90 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpMonitorAlarmCountMServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List monthList = rMpTargetWarnDMapper.getDate(beginMonth,endMonth,pendingId); if (!CollectionUtils.isEmpty(monthList)){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java index dd4a41c6d..e713b4e92 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RMpTargetWarnDServiceImpl.java +++ b/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监测点指标告警日统计算法开始"); List lineIds = calculatedParam.getIdList(); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List list = getData(calculatedParam.getDataDate(),pendingId); if (CollectionUtil.isNotEmpty(list)){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java index 49517d8f9..d9fa11e20 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/RStatDevSignalDPOServiceImpl.java +++ b/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 lineIds = calculatedParam.getIdList(); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { //获取监测点评价详情 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java index ee8b5ff83..9c27c13fb 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/AlarmDetailServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List intersectionList = diffData(nowDay,yesterday,pendingId); if (!CollectionUtils.isEmpty(intersectionList)){ 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 e97dc2687..903b449e4 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 @@ -144,8 +144,8 @@ public class DayDataServiceImpl implements DayDataService { List dayPltList = new ArrayList<>(); List lineIds = calculatedParam.getIdList(); - //以尺寸100分片 - List> pendingIds = ListUtils.partition(lineIds,100); + //河北数据量较大,以尺寸20分片 + List> 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 pendingId : pendingIds) { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index 0bb3f5610..3e6eccf53 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List lineDevGetDTOList = commTerminalGeneralClient.getMonitorDetailList(pendingId).getData(); List countList = this.getMeasurementCount(pendingId,beginDay,endDay); 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 587987b1a..f7b686fc3 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,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { list1.addAll(getAllTime(pendingId, startTime, endTime)); list2.addAll(getFlickerAllTime(pendingId, startTime, endTime)); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java index f933860b9..520ea907d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitTargetServiceImpl.java +++ b/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 lineIds = calculatedParam.getIdList(); LocalDate dateOut = LocalDate.parse(calculatedParam.getDataDate(),DatePattern.NORM_DATE_FORMATTER); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { limitRateData.addAll(getLimitRateDataFromMysql(pendingId,startTime,endTime)); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java index 3ea6618b0..d1b81e31e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpPartHarmonicDetailDServiceImpl.java +++ b/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监测点稳态指标超标明细日表1开始执行"); List lineIds = calculatedParam.getIdList(); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List list = getData(calculatedParam.getDataDate(),pendingId); if (CollectionUtil.isNotEmpty(list)){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java index 36c17acbd..b3495cf95 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpSurplusHarmonicDetailDServiceImpl.java +++ b/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监测点稳态指标超标明细日表2开始执行"); List lineIds = calculatedParam.getIdList(); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List result = this.baseMapper.getHarmonicDetailDayTwo(calculatedParam.getDataDate(),pendingId); if (CollectionUtil.isNotEmpty(result)){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java index 5187bb94c..678961d37 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpVThdServiceImpl.java +++ b/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 i log.info(LocalDateTime.now()+"===>监测点谐波畸变率开始执行"); List lineIds = calculatedParam.getIdList(); //以尺寸100分片,查询数据 - List> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { List result = this.baseMapper.getVThdData(calculatedParam.getDataDate(),pendingId); if (CollectionUtil.isNotEmpty(result)){ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelDServiceImpl.java index 0ca110b88..0956ec69f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelDServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { //查询电压表 vList.addAll(rStatDataVDMapper.getBenchmarkLevel(beginDay,endDay,pendingId)); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelMServiceImpl.java index 7757bf24d..162eea8ef 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelMServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); lambdaQueryWrapper.in(RMpBenchmarkLevelD::getMeasurementPointId,pendingId) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelQServiceImpl.java index 82a4ec7ce..7cc4e369b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelQServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); lambdaQueryWrapper.in(RMpBenchmarkLevelD::getMeasurementPointId,pendingId) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelYServiceImpl.java index ccaefd8ee..9120b9b41 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RMpBenchmarkLevelYServiceImpl.java +++ b/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> pendingIds = ListUtils.partition(lineIds,100); + List> pendingIds = ListUtils.partition(lineIds,20); for (List pendingId : pendingIds) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); lambdaQueryWrapper.in(RMpBenchmarkLevelD::getMeasurementPointId,pendingId)