From b0972ba896ab443979991d789a974bea2e38a24c Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 11 Dec 2025 14:56:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=9A=82=E6=80=81=E7=AE=97?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/DataCleanServiceImpl.java | 996 +++++++++--------- .../src/main/resources/bootstrap.yml | 4 +- .../MigrationInfluxDBController.java | 4 +- .../src/test/java/BaseJunitTest.java | 2 +- pom.xml | 45 +- 5 files changed, 549 insertions(+), 502 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java index afc8c75..d559f5a 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java @@ -26,6 +26,10 @@ import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.device.pq.pojo.vo.LineDetailVO; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.ListUtils; import org.slf4j.Logger; @@ -104,6 +108,8 @@ public class DataCleanServiceImpl implements IDataCleanService { private PqDataVerifyCountFeignClient pqDataVerifyCountFeignClient; @Resource private FileStorageUtil fileStorageUtil; + @Resource + private DicDataFeignClient dicDataFeignClient; @Override @Transactional(rollbackFor = Exception.class) @@ -118,7 +124,7 @@ public class DataCleanServiceImpl implements IDataCleanService { logger.error("监测点集合为空，无法计算!"); return; } - Map lineMap = lineDetailDataVOS.stream().collect(Collectors.toMap(LineDetailDataVO::getLineId, Function.identity())); + Map lineMap = lineDetailDataVOS.stream().collect(Collectors.toMap(LineDetailDataVO::getLineId, Function.identity())); LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setLineId(calculatedParam.getIdList()); @@ -127,7 +133,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //获取监测点的暂态事件 List eventList = rmpEventDetailFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(eventList)) { - eventList.forEach(item->{ + eventList.forEach(item -> { LineDetailDataVO vo = lineMap.get(item.getMeasurementPointId()); //暂态事件时间 LocalDateTime localDateTime = item.getStartTime(); @@ -149,12 +155,12 @@ public class DataCleanServiceImpl implements IDataCleanService { param.setEndTime(endTime); param.setDataType(false); - logger.info("监测点：{},数据剔除初始时间:{},结束时间:{}", item.getMeasurementPointId(),startTime,endTime); + logger.info("监测点：{},数据剔除初始时间:{},结束时间:{}", item.getMeasurementPointId(), startTime, endTime); //修改dataV数据 List dataV = dataVFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataV)) { - dataV.forEach(item1->{ + dataV.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataVFeignClient.addInfluxDbList(dataV); @@ -164,7 +170,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataI数据 List dataI = dataIFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataI)) { - dataI.forEach(item1->{ + dataI.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataIFeignClient.addInfluxDbList(dataI); @@ -174,7 +180,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataFlicker数据 List dataFlicker = dataFlickerFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataFlicker)) { - dataFlicker.forEach(item1->{ + dataFlicker.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataFlickerFeignClient.addInfluxDbList(dataFlicker); @@ -184,7 +190,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataFluc数据 List dataFluc = dataFlucFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataFluc)) { - dataFluc.forEach(item1->{ + dataFluc.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataFlucFeignClient.addInfluxDbList(dataFluc); @@ -194,7 +200,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmPhasicI数据 List dataHarmI = dataHarmphasicIFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataHarmI)) { - dataHarmI.forEach(item1->{ + dataHarmI.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmphasicIFeignClient.addInfluxDbList(dataHarmI); @@ -204,7 +210,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmPhasicV数据 List DataHarmV = dataHarmphasicVFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(DataHarmV)) { - DataHarmV.forEach(item1->{ + DataHarmV.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmphasicVFeignClient.addInfluxDbList(DataHarmV); @@ -214,7 +220,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmPowerP数据 List dataPowerP = dataHarmpowerPFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataPowerP)) { - dataPowerP.forEach(item1->{ + dataPowerP.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmpowerPFeignClient.addInfluxDbList(dataPowerP); @@ -224,7 +230,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmPowerQ数据 List dataHarmPowerQ = dataHarmpowerQFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataHarmPowerQ)) { - dataHarmPowerQ.forEach(item1->{ + dataHarmPowerQ.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmpowerQFeignClient.addInfluxDbList(dataHarmPowerQ); @@ -234,7 +240,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmPowerS数据 List dataHarmPowerS = dataHarmpowerSFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataHarmPowerS)) { - dataHarmPowerS.forEach(item1->{ + dataHarmPowerS.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmpowerSFeignClient.addInfluxDbList(dataHarmPowerS); @@ -244,7 +250,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmRateI数据 List dataHarmRateI = dataHarmRateIFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataHarmRateI)) { - dataHarmRateI.forEach(item1->{ + dataHarmRateI.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmRateIFeignClient.addInfluxDbList(dataHarmRateI); @@ -254,7 +260,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataHarmRateV数据 List DataHarmRateV = dataHarmRateVFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(DataHarmRateV)) { - DataHarmRateV.forEach(item1->{ + DataHarmRateV.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataHarmRateVFeignClient.addInfluxDbList(DataHarmRateV); @@ -264,7 +270,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataInHarmI数据 List dataInHarmI = dataInharmIFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataInHarmI)) { - dataInHarmI.forEach(item1->{ + dataInHarmI.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataInharmIFeignClient.addInfluxDbList(dataInHarmI); @@ -274,7 +280,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataInHarmV数据 List dataInHarmV = dataInharmVFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataInHarmV)) { - dataInHarmV.forEach(item1->{ + dataInHarmV.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataInharmVFeignClient.addInfluxDbList(dataInHarmV); @@ -284,7 +290,7 @@ public class DataCleanServiceImpl implements IDataCleanService { //修改dataPlt数据 List dataPlt = dataPltFeignClient.getRawData(param).getData(); if (CollUtil.isNotEmpty(dataPlt)) { - dataPlt.forEach(item1->{ + dataPlt.forEach(item1 -> { item1.setAbnormalFlag(1); }); dataPltFeignClient.addInfluxDbList(dataPlt); @@ -296,6 +302,8 @@ public class DataCleanServiceImpl implements IDataCleanService { @Override public void dataCleanHandler(CalculatedParam calculatedParam) { + DictData dip = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.VOLTAGE_DIP.getCode(), DicDataTypeEnum.EVENT_STATIS.getCode()).getData(); + DictData rise = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.VOLTAGE_RISE.getCode(), DicDataTypeEnum.EVENT_STATIS.getCode()).getData(); MemorySizeUtil.getNowMemory(); logger.info("{},原始表数据清洗=====》", LocalDateTime.now()); //获取标准 @@ -310,9 +318,9 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - lineDetail.forEach(item->{ + lineDetail.forEach(item -> { - List> resultData = new ArrayList<>(); + List> resultData = new ArrayList<>(); Set allTimeSet = new HashSet<>(); PqDataVerifyBak bak = new PqDataVerifyBak(); bak.setLineId(item.getLineId()); @@ -340,18 +348,18 @@ public class DataCleanServiceImpl implements IDataCleanService { List eventList = rmpEventDetailFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(data1)) { - logger.info("{}数据清洗dataV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data1)); + logger.info("{}数据清洗dataV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data1)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataV.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data1.forEach(data->{ - List pqDataVerifies = judgeDataV(pqReasonableRangeDtoMap,item,data); + data1.forEach(data -> { + List pqDataVerifies = judgeDataV(pqReasonableRangeDtoMap, item, data); result.addAll(pqDataVerifies); - }); + }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleDataV(result,bak,item.getTimeInterval()); + Map dtoMap = handleDataV(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -360,18 +368,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data2)) { - logger.info("{}数据清洗dataI集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data2)); + logger.info("{}数据清洗dataI集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data2)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataI.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data2.forEach(data->{ - List pqDataVerifies = judgeDataI(pqReasonableRangeDtoMap,item,data); + data2.forEach(data -> { + List pqDataVerifies = judgeDataI(pqReasonableRangeDtoMap, item, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleDataI(result,bak,item.getTimeInterval()); + Map dtoMap = handleDataI(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -380,18 +388,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data3)) { - logger.info("{}数据清洗dataPlt集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data3)); + logger.info("{}数据清洗dataPlt集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data3)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataPlt.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data3.forEach(data->{ - List pqDataVerifies = judgeDataPlt(pqReasonableRangeDtoMap,data); + data3.forEach(data -> { + List pqDataVerifies = judgeDataPlt(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleDataPlt(result,bak,item.getTimeInterval()); + Map dtoMap = handleDataPlt(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -400,18 +408,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data4)) { - logger.info("{}数据清洗dataInHarmV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data4)); + logger.info("{}数据清洗dataInHarmV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data4)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataInHarmV.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data4.forEach(data->{ - List pqDataVerifies = judgeDataInHarmV(pqReasonableRangeDtoMap,data); + data4.forEach(data -> { + List pqDataVerifies = judgeDataInHarmV(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleInHarmV(result,bak,item.getTimeInterval()); + Map dtoMap = handleInHarmV(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -420,18 +428,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data5)) { - logger.info("{}数据清洗dataHarmRateV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data5)); + logger.info("{}数据清洗dataHarmRateV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data5)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataHarmRateV.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data5.forEach(data->{ - List pqDataVerifies = judgeDataHarmRateV(pqReasonableRangeDtoMap,data); + data5.forEach(data -> { + List pqDataVerifies = judgeDataHarmRateV(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleHarmRateV(result,bak,item.getTimeInterval()); + Map dtoMap = handleHarmRateV(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -440,18 +448,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data6)) { - logger.info("{}数据清洗dataHarmPowerP集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data6)); + logger.info("{}数据清洗dataHarmPowerP集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data6)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataHarmPowerP.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data6.forEach(data->{ - List pqDataVerifies = judgeDataHarmPowerP(pqReasonableRangeDtoMap,data); + data6.forEach(data -> { + List pqDataVerifies = judgeDataHarmPowerP(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleHarmPowerP(result,bak,item.getTimeInterval()); + Map dtoMap = handleHarmPowerP(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -460,18 +468,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data7)) { - logger.info("{}数据清洗dataHarmPhasicV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data7)); + logger.info("{}数据清洗dataHarmPhasicV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data7)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataHarmPhasicV.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data7.forEach(data->{ - List pqDataVerifies = judgeDataHarmPhasicV(pqReasonableRangeDtoMap,data); + data7.forEach(data -> { + List pqDataVerifies = judgeDataHarmPhasicV(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleHarmPhasicV(result,bak,item.getTimeInterval()); + Map dtoMap = handleHarmPhasicV(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -480,18 +488,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data8)) { - logger.info("{}数据清洗dataFluc集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data8)); + logger.info("{}数据清洗dataFluc集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data8)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataFluc.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data8.forEach(data->{ - List pqDataVerifies = judgeDataFluc(pqReasonableRangeDtoMap,data); + data8.forEach(data -> { + List pqDataVerifies = judgeDataFluc(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleDataFluc(result,bak,item.getTimeInterval()); + Map dtoMap = handleDataFluc(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -500,18 +508,18 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(data9)) { - logger.info("{}数据清洗dataFlicker集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data9)); + logger.info("{}数据清洗dataFlicker集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(data9)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.DataFlicker.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - data9.forEach(data->{ - List pqDataVerifies = judgeDataFlicker(pqReasonableRangeDtoMap,data); + data9.forEach(data -> { + List pqDataVerifies = judgeDataFlicker(pqReasonableRangeDtoMap, data); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleDataFlicker(result,bak,item.getTimeInterval()); + Map dtoMap = handleDataFlicker(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -520,19 +528,19 @@ public class DataCleanServiceImpl implements IDataCleanService { } if (CollUtil.isNotEmpty(eventList)) { - logger.info("{}数据清洗eventDetail集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(eventList)); + logger.info("{}数据清洗eventDetail集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(eventList)); List result = new ArrayList<>(); List list = map.get(DataCleanEnum.RMpEventDetail.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); - eventList.forEach(data->{ - data.setFeatureAmplitude(data.getFeatureAmplitude()*100.0); - List pqDataVerifies = judgeDataEvent(pqReasonableRangeDtoMap,data); + eventList.forEach(data -> { + data.setFeatureAmplitude(data.getFeatureAmplitude() * 100.0); + List pqDataVerifies = judgeDataEvent(pqReasonableRangeDtoMap, data, dip, rise); result.addAll(pqDataVerifies); }); if (CollUtil.isNotEmpty(result)) { - Map dtoMap = handleDataEvent(result,bak,item.getTimeInterval()); + Map dtoMap = handleDataEvent(result, bak, item.getTimeInterval()); Set timeSet = new HashSet<>(result.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toSet())); - dtoMap.put("errorTimes",timeSet.size() * item.getTimeInterval()); + dtoMap.put("errorTimes", timeSet.size() * item.getTimeInterval()); allTimeSet.addAll(timeSet); if (CollUtil.isNotEmpty(dtoMap)) { resultData.add(dtoMap); @@ -552,69 +560,69 @@ public class DataCleanServiceImpl implements IDataCleanService { .collect(Collectors.toList()); if (CollUtil.isNotEmpty(dataV)) { verifyCount.setTotal(dataV.size()); - dataV.forEach(item1-> item1.setAbnormalFlag(1)); - dataVFeignClient.addInfluxDbList(dataV); - } - List dataI = data2.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataI)) { - dataI.forEach(item1-> item1.setAbnormalFlag(1)); - dataIFeignClient.addInfluxDbList(dataI); - } - List dataPlt = data3.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataPlt)) { - dataPlt.forEach(item1-> item1.setAbnormalFlag(1)); - dataPltFeignClient.addInfluxDbList(dataPlt); - } - List dataInHarmV = data4.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataInHarmV)) { - dataInHarmV.forEach(item1-> item1.setAbnormalFlag(1)); - dataInharmVFeignClient.addInfluxDbList(dataInHarmV); - } - List dataHarmRateV = data5.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataHarmRateV)) { - dataHarmRateV.forEach(item1-> item1.setAbnormalFlag(1)); - dataHarmRateVFeignClient.addInfluxDbList(dataHarmRateV); - } - List dataHarmPowerP = data6.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataHarmPowerP)) { - dataHarmPowerP.forEach(item1-> item1.setAbnormalFlag(1)); - dataHarmpowerPFeignClient.addInfluxDbList(dataHarmPowerP); - } - List dataHarmPhasicV = data7.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataHarmPhasicV)) { - dataHarmPhasicV.forEach(item1-> item1.setAbnormalFlag(1)); - dataHarmphasicVFeignClient.addInfluxDbList(dataHarmPhasicV); - } - List dataFluc = data8.stream() - .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) - .collect(Collectors.toList()); - if (CollUtil.isNotEmpty(dataFluc)) { - dataFluc.forEach(item1-> item1.setAbnormalFlag(1)); - dataFlucFeignClient.addInfluxDbList(dataFluc); +// dataV.forEach(item1-> item1.setAbnormalFlag(1)); +// dataVFeignClient.addInfluxDbList(dataV); } +// List dataI = data2.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataI)) { +// dataI.forEach(item1-> item1.setAbnormalFlag(1)); +// dataIFeignClient.addInfluxDbList(dataI); +// } +// List dataPlt = data3.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataPlt)) { +// dataPlt.forEach(item1-> item1.setAbnormalFlag(1)); +// dataPltFeignClient.addInfluxDbList(dataPlt); +// } +// List dataInHarmV = data4.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataInHarmV)) { +// dataInHarmV.forEach(item1-> item1.setAbnormalFlag(1)); +// dataInharmVFeignClient.addInfluxDbList(dataInHarmV); +// } +// List dataHarmRateV = data5.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataHarmRateV)) { +// dataHarmRateV.forEach(item1-> item1.setAbnormalFlag(1)); +// dataHarmRateVFeignClient.addInfluxDbList(dataHarmRateV); +// } +// List dataHarmPowerP = data6.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataHarmPowerP)) { +// dataHarmPowerP.forEach(item1-> item1.setAbnormalFlag(1)); +// dataHarmpowerPFeignClient.addInfluxDbList(dataHarmPowerP); +// } +// List dataHarmPhasicV = data7.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataHarmPhasicV)) { +// dataHarmPhasicV.forEach(item1-> item1.setAbnormalFlag(1)); +// dataHarmphasicVFeignClient.addInfluxDbList(dataHarmPhasicV); +// } +// List dataFluc = data8.stream() +// .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) +// .collect(Collectors.toList()); +// if (CollUtil.isNotEmpty(dataFluc)) { +// dataFluc.forEach(item1-> item1.setAbnormalFlag(1)); +// dataFlucFeignClient.addInfluxDbList(dataFluc); +// } List dataFlicker = data9.stream() .filter(item1 -> allTimeSet.contains(item1.getMinTime().substring(11, 19))) .collect(Collectors.toList()); if (CollUtil.isNotEmpty(dataFlicker)) { verifyCount.setFlicker(dataFlicker.size()); - dataFlicker.forEach(item1-> item1.setAbnormalFlag(1)); - dataFlickerFeignClient.addInfluxDbList(dataFlicker); +// dataFlicker.forEach(item1-> item1.setAbnormalFlag(1)); +// dataFlickerFeignClient.addInfluxDbList(dataFlicker); } pqDataVerifyCountFeignClient.insertData(verifyCount); - Map dtoMap = new HashMap<>(1); - dtoMap.put("lineErrorTimes",allTimeSet.size() * item.getTimeInterval()); + Map dtoMap = new HashMap<>(1); + dtoMap.put("lineErrorTimes", allTimeSet.size() * item.getTimeInterval()); resultData.add(dtoMap); } @@ -625,7 +633,7 @@ public class DataCleanServiceImpl implements IDataCleanService { String fileName = fileStorageUtil.uploadStreamSpecifyName( reportStream , OssPath.DATA_CLEAN + calculatedParam.getDataDate() + "/" - ,item.getLineId() + ".txt"); + , item.getLineId() + ".txt"); //存储数据 bak.setFilePath(fileName); } @@ -634,200 +642,200 @@ public class DataCleanServiceImpl implements IDataCleanService { System.gc(); } - public Map handleDataV(List result, PqDataVerifyBak bak,Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleDataV(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //频率 - List list1 = handleData(codeMap.get(DataCleanEnum.Freq.getCode()),timeInterval); + List list1 = handleData(codeMap.get(DataCleanEnum.Freq.getCode()), timeInterval); if (CollUtil.isNotEmpty(list1)) { bak.setFreq(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.Freq.getCode(),list1); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.Freq.getCode(), list1); } //频率偏差 - List list2 = handleData(codeMap.get(DataCleanEnum.FreqDev.getCode()),timeInterval); + List list2 = handleData(codeMap.get(DataCleanEnum.FreqDev.getCode()), timeInterval); if (CollUtil.isNotEmpty(list2)) { bak.setFreqDev(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.FreqDev.getCode(),list2); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.FreqDev.getCode(), list2); } //相电压有效值 - List list3 = handleData(codeMap.get(DataCleanEnum.RmsV.getCode()),timeInterval); + List list3 = handleData(codeMap.get(DataCleanEnum.RmsV.getCode()), timeInterval); if (CollUtil.isNotEmpty(list3)) { bak.setVRms(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.RmsV.getCode(),list3); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.RmsV.getCode(), list3); } //正序电压 - List list4 = handleData(codeMap.get(DataCleanEnum.VPos.getCode()),timeInterval); + List list4 = handleData(codeMap.get(DataCleanEnum.VPos.getCode()), timeInterval); if (CollUtil.isNotEmpty(list4)) { bak.setVPos(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VPos.getCode(),list4); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VPos.getCode(), list4); } //负序电压 - List list5 = handleData(codeMap.get(DataCleanEnum.VNeg.getCode()),timeInterval); + List list5 = handleData(codeMap.get(DataCleanEnum.VNeg.getCode()), timeInterval); if (CollUtil.isNotEmpty(list5)) { bak.setVNeg(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VNeg.getCode(),list5); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VNeg.getCode(), list5); } //零序电压 - List list6 = handleData(codeMap.get(DataCleanEnum.VZero.getCode()),timeInterval); + List list6 = handleData(codeMap.get(DataCleanEnum.VZero.getCode()), timeInterval); if (CollUtil.isNotEmpty(list6)) { bak.setVZero(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VZero.getCode(),list6); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VZero.getCode(), list6); } //电压不平衡度 - List list7 = handleData(codeMap.get(DataCleanEnum.VUnbalance.getCode()),timeInterval); + List list7 = handleData(codeMap.get(DataCleanEnum.VUnbalance.getCode()), timeInterval); if (CollUtil.isNotEmpty(list7)) { bak.setVUnbalance(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VUnbalance.getCode(),list7); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VUnbalance.getCode(), list7); } //线电压有效值 - List list8 = handleData(codeMap.get(DataCleanEnum.RmsLvr.getCode()),timeInterval); + List list8 = handleData(codeMap.get(DataCleanEnum.RmsLvr.getCode()), timeInterval); if (CollUtil.isNotEmpty(list8)) { bak.setRmsLvr(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.RmsLvr.getCode(),list8); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.RmsLvr.getCode(), list8); } //电压正偏差 - List list9 = handleData(codeMap.get(DataCleanEnum.VuDev.getCode()),timeInterval); + List list9 = handleData(codeMap.get(DataCleanEnum.VuDev.getCode()), timeInterval); if (CollUtil.isNotEmpty(list9)) { bak.setVuDev(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VuDev.getCode(),list9); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VuDev.getCode(), list9); } //电压负偏差 - List list10 = handleData(codeMap.get(DataCleanEnum.VlDev.getCode()),timeInterval); + List list10 = handleData(codeMap.get(DataCleanEnum.VlDev.getCode()), timeInterval); if (CollUtil.isNotEmpty(list10)) { bak.setVlDev(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VlDev.getCode(),list10); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VlDev.getCode(), list10); } //电压总谐波畸变率 - List list11 = handleData(codeMap.get(DataCleanEnum.VThd.getCode()),timeInterval); + List list11 = handleData(codeMap.get(DataCleanEnum.VThd.getCode()), timeInterval); if (CollUtil.isNotEmpty(list11)) { bak.setVThd(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VThd.getCode(),list11); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.VThd.getCode(), list11); } //相（线）电压基波有效值 - List list12 = handleData(codeMap.get(DataCleanEnum.V_Data.getCode()),timeInterval); + List list12 = handleData(codeMap.get(DataCleanEnum.V_Data.getCode()), timeInterval); if (CollUtil.isNotEmpty(list12)) { bak.setV(1); - map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.V_Data.getCode(),list12); + map.put(DataCleanEnum.DataV.getCode() + "-" + DataCleanEnum.V_Data.getCode(), list12); } return map; } - public Map handleDataI(List result, PqDataVerifyBak bak,Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleDataI(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //电流有效值 - List list = handleData(codeMap.get(DataCleanEnum.RmsI.getCode()),timeInterval); + List list = handleData(codeMap.get(DataCleanEnum.RmsI.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setIRms(1); - map.put(DataCleanEnum.DataI.getCode() + "-" + DataCleanEnum.RmsI.getCode(),list); + map.put(DataCleanEnum.DataI.getCode() + "-" + DataCleanEnum.RmsI.getCode(), list); } return map; } - public Map handleDataPlt(List result, PqDataVerifyBak bak, Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleDataPlt(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //长时闪变 List list = handleData(codeMap.get(DataCleanEnum.Plt.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setPlt(1); - map.put(DataCleanEnum.DataPlt.getCode() + "-" + DataCleanEnum.Plt.getCode(),list); + map.put(DataCleanEnum.DataPlt.getCode() + "-" + DataCleanEnum.Plt.getCode(), list); } return map; } - public Map handleInHarmV(List result, PqDataVerifyBak bak, Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleInHarmV(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //间谐波电压含有率 - List list = handleHarmData(codeMap.get(DataCleanEnum.V_InHarm.getCode()),timeInterval); + List list = handleHarmData(codeMap.get(DataCleanEnum.V_InHarm.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setVInharm(1); - map.put(DataCleanEnum.DataInHarmV.getCode() + "-" + DataCleanEnum.V_InHarm.getCode(),list); + map.put(DataCleanEnum.DataInHarmV.getCode() + "-" + DataCleanEnum.V_InHarm.getCode(), list); } return map; } - public Map handleHarmRateV(List result, PqDataVerifyBak bak, Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleHarmRateV(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //谐波电压含有率 - List list = handleHarmData(codeMap.get(DataCleanEnum.V_Rate.getCode()),timeInterval); + List list = handleHarmData(codeMap.get(DataCleanEnum.V_Rate.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setVHarm(1); - map.put(DataCleanEnum.DataHarmRateV.getCode() + "-" + DataCleanEnum.V_Rate.getCode(),list); + map.put(DataCleanEnum.DataHarmRateV.getCode() + "-" + DataCleanEnum.V_Rate.getCode(), list); } return map; } - public Map handleHarmPowerP(List result, PqDataVerifyBak bak, Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleHarmPowerP(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //功率因素 - List list = handleData(codeMap.get(DataCleanEnum.Pf.getCode()),timeInterval); + List list = handleData(codeMap.get(DataCleanEnum.Pf.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setPf(1); - map.put(DataCleanEnum.DataHarmPowerP.getCode() + "-" + DataCleanEnum.Pf.getCode(),list); + map.put(DataCleanEnum.DataHarmPowerP.getCode() + "-" + DataCleanEnum.Pf.getCode(), list); } return map; } - public Map handleHarmPhasicV(List result, PqDataVerifyBak bak, Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleHarmPhasicV(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //谐波电压相角 - List list = handleHarmData(codeMap.get(DataCleanEnum.V.getCode()),timeInterval); + List list = handleHarmData(codeMap.get(DataCleanEnum.V.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setVPhasic(1); - map.put(DataCleanEnum.DataHarmPhasicV.getCode() + "-" + DataCleanEnum.V.getCode(),list); + map.put(DataCleanEnum.DataHarmPhasicV.getCode() + "-" + DataCleanEnum.V.getCode(), list); } //谐波电压基波相角 - List list2 = handleData(codeMap.get(DataCleanEnum.V1.getCode()),timeInterval); + List list2 = handleData(codeMap.get(DataCleanEnum.V1.getCode()), timeInterval); if (CollUtil.isNotEmpty(list2)) { bak.setV1Phasic(1); - map.put(DataCleanEnum.DataHarmPhasicV.getCode() + "-" + DataCleanEnum.V1.getCode(),list2); + map.put(DataCleanEnum.DataHarmPhasicV.getCode() + "-" + DataCleanEnum.V1.getCode(), list2); } return map; } - public Map handleDataFluc(List result, PqDataVerifyBak bak, Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleDataFluc(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //电压波动 - List list = handleData(codeMap.get(DataCleanEnum.Fluc.getCode()),timeInterval); + List list = handleData(codeMap.get(DataCleanEnum.Fluc.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setFluc(1); - map.put(DataCleanEnum.DataFluc.getCode() + "-" + DataCleanEnum.Fluc.getCode(),list); + map.put(DataCleanEnum.DataFluc.getCode() + "-" + DataCleanEnum.Fluc.getCode(), list); } return map; } - public Map handleDataFlicker(List result, PqDataVerifyBak bak,Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleDataFlicker(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //短时闪变 - List list = handleData(codeMap.get(DataCleanEnum.Pst.getCode()),timeInterval); + List list = handleData(codeMap.get(DataCleanEnum.Pst.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setPst(1); - map.put(DataCleanEnum.DataFlicker.getCode() + "-" + DataCleanEnum.Pst.getCode(),list); + map.put(DataCleanEnum.DataFlicker.getCode() + "-" + DataCleanEnum.Pst.getCode(), list); } return map; } - public Map handleDataEvent(List result, PqDataVerifyBak bak,Integer timeInterval) { - Map map = new HashMap<>(); - Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); + public Map handleDataEvent(List result, PqDataVerifyBak bak, Integer timeInterval) { + Map map = new HashMap<>(); + Map> codeMap = result.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexCode)); //暂降事件 - List list = handleData(codeMap.get(DataCleanEnum.VoltageDip.getCode()),timeInterval); + List list = handleData(codeMap.get(DataCleanEnum.VoltageDip.getCode()), timeInterval); if (CollUtil.isNotEmpty(list)) { bak.setDip(1); - map.put(DataCleanEnum.RMpEventDetail.getCode() + "-" + DataCleanEnum.VoltageDip.getCode(),list); + map.put(DataCleanEnum.RMpEventDetail.getCode() + "-" + DataCleanEnum.VoltageDip.getCode(), list); } //暂升事件 - List list2 = handleData(codeMap.get(DataCleanEnum.VoltageRise.getCode()),timeInterval); + List list2 = handleData(codeMap.get(DataCleanEnum.VoltageRise.getCode()), timeInterval); if (CollUtil.isNotEmpty(list2)) { bak.setRise(1); - map.put(DataCleanEnum.RMpEventDetail.getCode() + "-" + DataCleanEnum.VoltageRise.getCode(),list2); + map.put(DataCleanEnum.RMpEventDetail.getCode() + "-" + DataCleanEnum.VoltageRise.getCode(), list2); } return map; } @@ -840,10 +848,10 @@ public class DataCleanServiceImpl implements IDataCleanService { DataCleanJsonDTO.DataHarmCleanJsonDTO dto = new DataCleanJsonDTO.DataHarmCleanJsonDTO(); dto.setTargetName(list.get(0).getIndexName()); List list1 = new ArrayList<>(); - Map> phaseMap = list.stream().collect(Collectors.groupingBy(PqDataVerify::getPhasicType)); - phaseMap.forEach((k,v)->{ + Map> phaseMap = list.stream().collect(Collectors.groupingBy(PqDataVerify::getPhasicType)); + phaseMap.forEach((k, v) -> { Map> map11 = v.stream().collect(Collectors.groupingBy(PqDataVerify::getValueType)); - map11.forEach((k2,v2)->{ + map11.forEach((k2, v2) -> { DataCleanJsonDTO.DataHarmCleanNormalJsonDTO dataCleanJsonDTO = new DataCleanJsonDTO.DataHarmCleanNormalJsonDTO(); dataCleanJsonDTO.setPhasic(k); dataCleanJsonDTO.setValueType(k2); @@ -869,7 +877,7 @@ public class DataCleanServiceImpl implements IDataCleanService { list1.add(dataCleanJsonDTO); }); dto.setErrorCounts(allCounts.get()); - dto.setErrorTimes(timeSet.size()*timeInterval); + dto.setErrorTimes(timeSet.size() * timeInterval); dto.setMinValue(list.get(0).getMinValue()); dto.setMaxValue(list.get(0).getMaxValue()); dto.setList(list1); @@ -884,15 +892,15 @@ public class DataCleanServiceImpl implements IDataCleanService { if (CollUtil.isNotEmpty(list)) { AtomicInteger allCounts = new AtomicInteger(); Set timeSet = new HashSet<>(); - Map> indexNameMap = list.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexName)); - indexNameMap.forEach((k,v)->{ + Map> indexNameMap = list.stream().collect(Collectors.groupingBy(PqDataVerify::getIndexName)); + indexNameMap.forEach((k, v) -> { DataCleanJsonDTO.DataHarmCleanJsonDTO dto = new DataCleanJsonDTO.DataHarmCleanJsonDTO(); dto.setTargetName(k); List dataCleanJsonDTOList = new ArrayList<>(); - Map> phaseMap = v.stream().collect(Collectors.groupingBy(PqDataVerify::getPhasicType)); - phaseMap.forEach((k2,v2)->{ + Map> phaseMap = v.stream().collect(Collectors.groupingBy(PqDataVerify::getPhasicType)); + phaseMap.forEach((k2, v2) -> { Map> valueMap = v2.stream().collect(Collectors.groupingBy(PqDataVerify::getValueType)); - valueMap.forEach((k3,v3)->{ + valueMap.forEach((k3, v3) -> { DataCleanJsonDTO.DataHarmCleanNormalJsonDTO dto1 = new DataCleanJsonDTO.DataHarmCleanNormalJsonDTO(); dto1.setPhasic(k2); dto1.setValueType(k3); @@ -918,7 +926,7 @@ public class DataCleanServiceImpl implements IDataCleanService { dataCleanJsonDTOList.add(dto1); }); dto.setErrorCounts(allCounts.get()); - dto.setErrorTimes(timeSet.size()*timeInterval); + dto.setErrorTimes(timeSet.size() * timeInterval); dto.setList(dataCleanJsonDTOList); }); dataList.add(dto); @@ -929,7 +937,7 @@ public class DataCleanServiceImpl implements IDataCleanService { @Override public void dataVCleanHandler(CalculatedParam calculatedParam) { - MemorySizeUtil.getNowMemory(); + MemorySizeUtil.getNowMemory(); List result = new ArrayList<>(); //获取标准 @@ -941,20 +949,20 @@ public class DataCleanServiceImpl implements IDataCleanService { logger.error("监测点集合为空，无法计算!"); return; } - Map lineMap = lineDetail.stream().collect(Collectors.toMap(LineDetailVO.Detail::getLineId, Function.identity())); + Map lineMap = lineDetail.stream().collect(Collectors.toMap(LineDetailVO.Detail::getLineId, Function.identity())); //数据分片处理 LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataVFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataV(map, lineMap.get(item.getLineId()),item); + List pqDataVerifies = judgeDataV(map, lineMap.get(item.getLineId()), item); result.addAll(pqDataVerifies); }); } @@ -982,20 +990,20 @@ public class DataCleanServiceImpl implements IDataCleanService { logger.error("监测点集合为空，无法计算!"); return; } - Map lineMap = lineDetail.stream().collect(Collectors.toMap(LineDetailVO.Detail::getLineId, Function.identity())); + Map lineMap = lineDetail.stream().collect(Collectors.toMap(LineDetailVO.Detail::getLineId, Function.identity())); //数据分片处理 LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataIFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataI集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataI集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataI(map, lineMap.get(item.getLineId()),item); + List pqDataVerifies = judgeDataI(map, lineMap.get(item.getLineId()), item); result.addAll(pqDataVerifies); }); } @@ -1022,15 +1030,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataPltFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataPlt集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataPlt集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataPlt(map,item); + List pqDataVerifies = judgeDataPlt(map, item); result.addAll(pqDataVerifies); }); } @@ -1057,15 +1065,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataInharmVFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataInHarmV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataInHarmV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataInHarmV(map,item); + List pqDataVerifies = judgeDataInHarmV(map, item); result.addAll(pqDataVerifies); }); } @@ -1092,15 +1100,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataHarmRateVFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataHarmRateV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataHarmRateV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataHarmRateV(map,item); + List pqDataVerifies = judgeDataHarmRateV(map, item); result.addAll(pqDataVerifies); }); } @@ -1127,15 +1135,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataHarmpowerPFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataHarmPowerP集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataHarmPowerP集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataHarmPowerP(map,item); + List pqDataVerifies = judgeDataHarmPowerP(map, item); result.addAll(pqDataVerifies); }); } @@ -1162,15 +1170,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataHarmphasicVFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataHarmPhasicV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataHarmPhasicV集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataHarmPhasicV(map,item); + List pqDataVerifies = judgeDataHarmPhasicV(map, item); result.addAll(pqDataVerifies); }); } @@ -1197,15 +1205,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataFlucFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataFluc集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataFluc集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataFluc(map,item); + List pqDataVerifies = judgeDataFluc(map, item); result.addAll(pqDataVerifies); }); } @@ -1232,15 +1240,15 @@ public class DataCleanServiceImpl implements IDataCleanService { LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate())); - List> pendingIds = ListUtils.partition(lineList,NUM); - pendingIds.forEach(list->{ + List> pendingIds = ListUtils.partition(lineList, NUM); + pendingIds.forEach(list -> { lineParam.setLineId(list); List partList = dataFlickerFeignClient.getRawData(lineParam).getData(); if (CollUtil.isNotEmpty(partList)) { - logger.info("{}数据清洗dataFlicker集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); - partList.forEach(item->{ + logger.info("{}数据清洗dataFlicker集合大小为>>>>>>>>>>>>{}", lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList)); + partList.forEach(item -> { //数据清洗 - List pqDataVerifies = judgeDataFlicker(map,item); + List pqDataVerifies = judgeDataFlicker(map, item); result.addAll(pqDataVerifies); }); } @@ -1300,22 +1308,22 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.Freq.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getFreq())){ + if (ObjectUtil.isNotNull(dto.getFreq())) { if (dto.getFreq() < pqReasonableRangeDto.getMinValue() || dto.getFreq() > pqReasonableRangeDto.getMaxValue()) { //log.info("dataV-频率数据异常,已清洗!数据值:{},数据时间:{}", dto.getFreq(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getFreq() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getFreq() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("freq{}", dto); } } @@ -1324,22 +1332,22 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.FreqDev.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getFreqDev())){ + if (ObjectUtil.isNotNull(dto.getFreqDev())) { if (dto.getFreqDev() < pqReasonableRangeDto.getMinValue() || dto.getFreqDev() > pqReasonableRangeDto.getMaxValue()) { //log.info("dataV-频率偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getFreqDev(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getFreqDev() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getFreqDev() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("freqDev{}", dto); } } @@ -1348,23 +1356,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getRms())){ - if (dto.getRms() < (pqReasonableRangeDto.getMinValue()* DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getRms() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + if (ObjectUtil.isNotNull(dto.getRms())) { + if (dto.getRms() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getRms() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { //log.info("dataV-相电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRms(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getRms() - ,pqReasonableRangeDto.getMinValue()* DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getRms() + , pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()) + , pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())); list.add(pqDataVerify); } - }else{ + } else { logger.info("rmsV{}", dto); } } @@ -1373,23 +1381,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getVPos())){ - if (dto.getVPos() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getVPos() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + if (ObjectUtil.isNotNull(dto.getVPos())) { + if (dto.getVPos() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getVPos() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { //log.info("dataV-正序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVPos(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVPos() - ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVPos() + , pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()) + , pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())); list.add(pqDataVerify); } - }else{ + } else { logger.info("vPos{}", dto); } } @@ -1398,23 +1406,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VNeg.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getVNeg())){ - if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getVNeg() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + if (ObjectUtil.isNotNull(dto.getVNeg())) { + if (dto.getVNeg() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getVNeg() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { //log.info("dataV-负序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVNeg(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVNeg() - ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVNeg() + , pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()) + , pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())); list.add(pqDataVerify); } - }else{ + } else { logger.info("vNeg{}", dto); } } @@ -1423,23 +1431,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VZero.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getVZero())){ - if (dto.getVZero() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getVZero() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + if (ObjectUtil.isNotNull(dto.getVZero())) { + if (dto.getVZero() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getVZero() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { //log.info("dataV-零序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVZero(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVZero() - ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVZero() + , pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()) + , pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())); list.add(pqDataVerify); } - }else{ + } else { logger.info("vZero{}", dto); } } @@ -1448,22 +1456,22 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VUnbalance.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getVUnbalance())){ + if (ObjectUtil.isNotNull(dto.getVUnbalance())) { if (dto.getVUnbalance() < pqReasonableRangeDto.getMinValue() || dto.getVUnbalance() > pqReasonableRangeDto.getMaxValue()) { //log.info("dataV-电压不平衡度数据异常,已清洗!数据值:{},数据时间:{}", dto.getVUnbalance(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVUnbalance() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVUnbalance() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("vUnbalance{}", dto); } } @@ -1472,19 +1480,19 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.RmsLvr.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType()) && ObjectUtil.isNotNull(dto.getRmsLvr())) { - if (dto.getRmsLvr() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + if (dto.getRmsLvr() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { //log.info("dataV-线电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRmsLvr(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getRmsLvr() - ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getRmsLvr() + , pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()) + , pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())); list.add(pqDataVerify); } } @@ -1499,15 +1507,15 @@ public class DataCleanServiceImpl implements IDataCleanService { if (dto.getVuDev() > pqReasonableRangeDto.getMaxValue()) { //log.info("dataV-线电压正偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getVuDev(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVuDev() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVuDev() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } } @@ -1518,20 +1526,20 @@ public class DataCleanServiceImpl implements IDataCleanService { if (dto.getVuDev() < pqReasonableRangeDto.getMinValue()) { //log.info("dataV-线电压负偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getVlDev(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVuDev() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVuDev() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } } } - }else{ + } else { logger.info("vuDev{}", dto); } @@ -1579,22 +1587,22 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VThd.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getVThd())){ + if (ObjectUtil.isNotNull(dto.getVThd())) { if (dto.getVThd() < pqReasonableRangeDto.getMinValue() || dto.getVThd() > pqReasonableRangeDto.getMaxValue()) { //log.info("dataV-电压总谐波畸变率数据异常,已清洗!数据值:{},数据时间:{}", dto.getVThd(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getVThd() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getVThd() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("vThd{}", dto); } } @@ -1603,23 +1611,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.V_Data.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getV1())){ - if (dto.getV1() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getV1() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { + if (ObjectUtil.isNotNull(dto.getV1())) { + if (dto.getV1() < (pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getV1() > (pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) { //log.info("dataV-基波电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getV1(), dto.getMinTime()); PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getV1() - ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()) - ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getV1() + , pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()) + , pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())); list.add(pqDataVerify); } - }else{ + } else { logger.info("vData{}", dto); } } @@ -1637,21 +1645,21 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.RmsI.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getRms())){ + if (ObjectUtil.isNotNull(dto.getRms())) { if (dto.getRms() >= line.getCT1() * 1.2) { PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getRms() - ,pqReasonableRangeDto.getMinValue() - ,line.getCT1()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getRms() + , pqReasonableRangeDto.getMinValue() + , line.getCT1()); list.add(pqDataVerify); } - }else{ + } else { logger.info("rmsI{}", dto); } } @@ -1669,21 +1677,21 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.Plt.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getPlt())){ + if (ObjectUtil.isNotNull(dto.getPlt())) { if (dto.getPlt() < pqReasonableRangeDto.getMinValue() || dto.getPlt() > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getPlt() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getPlt() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("plt{}", dto); } } @@ -1702,7 +1710,7 @@ public class DataCleanServiceImpl implements IDataCleanService { for (int i = 1; i <= 50; i++) { // 通过反射获取dto.getV(i)的值 Double vValue = getVValue(dto, i); - if(ObjectUtil.isNotNull(vValue)){ + if (ObjectUtil.isNotNull(vValue)) { if (vValue < pqReasonableRangeDto.getMinValue() || vValue > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify( dto.getLineId(), @@ -1736,7 +1744,7 @@ public class DataCleanServiceImpl implements IDataCleanService { for (int i = 2; i <= 50; i++) { // 通过反射获取dto.getV(i)的值 Double vValue = getVValue(dto, i); - if(ObjectUtil.isNotNull(vValue)){ + if (ObjectUtil.isNotNull(vValue)) { if (vValue < pqReasonableRangeDto.getMinValue() || vValue > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify( dto.getLineId(), @@ -1766,21 +1774,21 @@ public class DataCleanServiceImpl implements IDataCleanService { PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Pf.getCode()); List phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getPf())){ + if (ObjectUtil.isNotNull(dto.getPf())) { if (dto.getPf() < pqReasonableRangeDto.getMinValue() || dto.getPf() > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getPf() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getPf() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("pf{}", dto); } } @@ -1799,7 +1807,7 @@ public class DataCleanServiceImpl implements IDataCleanService { for (int i = 1; i <= 50; i++) { // 通过反射获取dto.getV(i)的值 Double vValue = getVValue(dto, i); - if(ObjectUtil.isNotNull(vValue)){ + if (ObjectUtil.isNotNull(vValue)) { if (vValue < -180) { vValue = vValue + 360; } @@ -1821,7 +1829,7 @@ public class DataCleanServiceImpl implements IDataCleanService { ); list.add(pqDataVerify); } - }else { + } else { logger.info("DataHarmPhasicV{}", dto); } } @@ -1837,21 +1845,21 @@ public class DataCleanServiceImpl implements IDataCleanService { PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Fluc.getCode()); List phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getFluc())){ + if (ObjectUtil.isNotNull(dto.getFluc())) { if (dto.getFluc() < pqReasonableRangeDto.getMinValue() || dto.getFluc() > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getFluc() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getFluc() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("flus{}", dto); } } @@ -1866,21 +1874,21 @@ public class DataCleanServiceImpl implements IDataCleanService { PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.Pst.getCode()); List phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - if(ObjectUtil.isNotNull(dto.getPst())){ + if (ObjectUtil.isNotNull(dto.getPst())) { if (dto.getPst() < pqReasonableRangeDto.getMinValue() || dto.getPst() > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() - ,dto.getMinTime() - ,dto.getValueType() - ,dto.getPhasicType() - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getPst() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); + , dto.getMinTime() + , dto.getValueType() + , dto.getPhasicType() + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getPst() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); list.add(pqDataVerify); } - }else{ + } else { logger.info("pst{}", dto); } } @@ -1890,49 +1898,53 @@ public class DataCleanServiceImpl implements IDataCleanService { /** * 获取数据的标准范围，进行数据比对 */ - public List judgeDataEvent(Map map, RmpEventDetailDTO dto) { + public List judgeDataEvent(Map map, RmpEventDetailDTO dto, DictData dip, DictData rise) { List list = new ArrayList<>(); - PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.VoltageDip.getCode()); - if(ObjectUtil.isNotNull(dto.getFeatureAmplitude())){ - if (dto.getFeatureAmplitude() < pqReasonableRangeDto.getMinValue() || dto.getFeatureAmplitude() > pqReasonableRangeDto.getMaxValue()) { - PqDataVerify pqDataVerify = getPqDataVerify(dto.getMeasurementPointId() - ,dto.getStartTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_MS_PATTERN)) - ,"Feature_Amplitude" - ,"/" - ,pqReasonableRangeDto.getIndexCode() - ,pqReasonableRangeDto.getIndexName() - ,pqReasonableRangeDto.getInfluxdbTableName() - ,dto.getFeatureAmplitude() - ,pqReasonableRangeDto.getMinValue() - ,pqReasonableRangeDto.getMaxValue()); - list.add(pqDataVerify); + if (ObjectUtil.isNotNull(dip)) { + PqReasonableRangeDto pqReasonableRangeDto = map.get(DataCleanEnum.VoltageDip.getCode()); + if (ObjectUtil.isNotNull(dto.getFeatureAmplitude()) && dip.getId().equals(dto.getEventType())) { + if (dto.getFeatureAmplitude() < pqReasonableRangeDto.getMinValue() || dto.getFeatureAmplitude() > pqReasonableRangeDto.getMaxValue()) { + PqDataVerify pqDataVerify = getPqDataVerify(dto.getMeasurementPointId() + , dto.getStartTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_MS_PATTERN)) + , "Feature_Amplitude" + , "/" + , pqReasonableRangeDto.getIndexCode() + , pqReasonableRangeDto.getIndexName() + , pqReasonableRangeDto.getInfluxdbTableName() + , dto.getFeatureAmplitude() + , pqReasonableRangeDto.getMinValue() + , pqReasonableRangeDto.getMaxValue()); + list.add(pqDataVerify); + } } } - PqReasonableRangeDto pqReasonableRangeDto2 = map.get(DataCleanEnum.VoltageRise.getCode()); - if(ObjectUtil.isNotNull(dto.getFeatureAmplitude())){ - if (dto.getFeatureAmplitude() < pqReasonableRangeDto2.getMinValue() || dto.getFeatureAmplitude() > pqReasonableRangeDto2.getMaxValue()) { - PqDataVerify pqDataVerify = getPqDataVerify(dto.getMeasurementPointId() - ,dto.getStartTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_MS_PATTERN)) - ,"Feature_Amplitude" - ,"/" - ,pqReasonableRangeDto2.getIndexCode() - ,pqReasonableRangeDto2.getIndexName() - ,pqReasonableRangeDto2.getInfluxdbTableName() - ,dto.getFeatureAmplitude() - ,pqReasonableRangeDto2.getMinValue() - ,pqReasonableRangeDto2.getMaxValue()); - list.add(pqDataVerify); + if (ObjectUtil.isNotNull(rise)) { + PqReasonableRangeDto pqReasonableRangeDto2 = map.get(DataCleanEnum.VoltageRise.getCode()); + if (ObjectUtil.isNotNull(dto.getFeatureAmplitude()) && rise.getId().equals(dto.getEventType())) { + if (dto.getFeatureAmplitude() < pqReasonableRangeDto2.getMinValue() || dto.getFeatureAmplitude() > pqReasonableRangeDto2.getMaxValue()) { + PqDataVerify pqDataVerify = getPqDataVerify(dto.getMeasurementPointId() + , dto.getStartTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_MS_PATTERN)) + , "Feature_Amplitude" + , "/" + , pqReasonableRangeDto2.getIndexCode() + , pqReasonableRangeDto2.getIndexName() + , pqReasonableRangeDto2.getInfluxdbTableName() + , dto.getFeatureAmplitude() + , pqReasonableRangeDto2.getMinValue() + , pqReasonableRangeDto2.getMaxValue()); + list.add(pqDataVerify); + } } } return list; } - public PqDataVerify getPqDataVerify(String lineId,String time,String valueType, String phasicType, String indexCode, String indexName, String indexTable, Double data, Double minValue, Double maxValue) { + public PqDataVerify getPqDataVerify(String lineId, String time, String valueType, String phasicType, String indexCode, String indexName, String indexTable, Double data, Double minValue, Double maxValue) { PqDataVerify pqDataVerify = new PqDataVerify(); pqDataVerify.setLineId(lineId); - pqDataVerify.setTime(time.contains(".")?TimeUtils.StringToLocalDateTimeSSS(time):TimeUtils.StringToLocalDateTime(time)); - pqDataVerify.setValueType(Objects.isNull(valueType)?"AVG":valueType); + pqDataVerify.setTime(time.contains(".") ? TimeUtils.StringToLocalDateTimeSSS(time) : TimeUtils.StringToLocalDateTime(time)); + pqDataVerify.setValueType(Objects.isNull(valueType) ? "AVG" : valueType); pqDataVerify.setPhasicType(phasicType); pqDataVerify.setIndexCode(indexCode); pqDataVerify.setIndexName(indexName); @@ -1954,12 +1966,12 @@ public class DataCleanServiceImpl implements IDataCleanService { try { Method method = DataHarmDto.class.getMethod("getV" + index); Object invoke = method.invoke(dto); - if(invoke==null){ + if (invoke == null) { return null; } return (Double) invoke; } catch (Exception e) { - throw new RuntimeException(dto+"Failed to get V value for index: " + index, e); + throw new RuntimeException(dto + "Failed to get V value for index: " + index, e); } } diff --git a/algorithm/algorithm-boot/src/main/resources/bootstrap.yml b/algorithm/algorithm-boot/src/main/resources/bootstrap.yml index edf5cfe..dbcc822 100644 --- a/algorithm/algorithm-boot/src/main/resources/bootstrap.yml +++ b/algorithm/algorithm-boot/src/main/resources/bootstrap.yml @@ -58,7 +58,7 @@ liteflow: logging: config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: - root: + root: error #mybatis配置信息 @@ -66,7 +66,7 @@ mybatis-plus: #别名扫描 type-aliases-package: com.njcn.harmonic.pojo line: - num: 20 + num: 10 mqtt: client-id: @artifactId@${random.value} \ No newline at end of file diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java index 69c024f..233d708 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/controller/MigrationInfluxDBController.java @@ -82,14 +82,14 @@ public class MigrationInfluxDBController { long betweenDay = LocalDateTimeUtil.between(startDate, endDate, ChronoUnit.HOURS); param.setStartTime(startDate.format(dateTimeFormatter)); param.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter)); - migrationService.hourseLineEventBacthSysc(param); + migrationService.hourseDevDataBacthSysc(param); for (int i = 0; i - 192.168.1.22 - 192.168.1.121 - 192.168.1.22 - ${middle.server.url}:18848 - 07ec981d-1377-4920-8760-b5a98ff7e668 + + + + + + + + + + + + + + + + + + + + + + + + + + + 127.0.0.1 + 127.0.0.1 + 127.0.0.1 + ${middle.server.url}:8848 + 37a0e99f-eb96-4d2f-9b47-75bffa765827 + + + + + + + + + ${middle.server.url}:8080