From 3505b163855f0c6b6a1e7628b0599698026e2cea Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 23 Jul 2025 14:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/DataCleanServiceImpl.java | 392 ++++++++++-------- .../line/IDataCrossingServiceImpl.java | 15 +- 2 files changed, 236 insertions(+), 171 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 ddccbe0..11d46b8 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 @@ -1182,19 +1182,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.Freq.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("freq{}", dto); } } @@ -1202,19 +1206,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.FreqDev.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("freqDev{}", dto); } } @@ -1222,20 +1230,24 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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())); - list.add(pqDataVerify); + 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())); + list.add(pqDataVerify); + } + }else{ + logger.info("rmsV{}", dto); } } @@ -1243,20 +1255,24 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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())); - list.add(pqDataVerify); + 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())); + list.add(pqDataVerify); + } + }else{ + logger.info("vPos{}", dto); } } @@ -1264,20 +1280,24 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VNeg.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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())); - list.add(pqDataVerify); + 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())); + list.add(pqDataVerify); + } + }else{ + logger.info("vNeg{}", dto); } } @@ -1285,20 +1305,24 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VZero.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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())); - list.add(pqDataVerify); + 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())); + list.add(pqDataVerify); + } + }else{ + logger.info("vZero{}", dto); } } @@ -1306,19 +1330,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VUnbalance.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("vUnbalance{}", dto); } } @@ -1385,6 +1413,8 @@ public class DataCleanServiceImpl implements IDataCleanService { } } } + }else{ + logger.info("vuDev{}", dto); } // //线电压正偏差 @@ -1431,19 +1461,23 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.VThd.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("vThd{}", dto); } } @@ -1481,18 +1515,22 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.RmsI.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("rmsI{}", dto); } } return list; @@ -1509,18 +1547,22 @@ public class DataCleanServiceImpl implements IDataCleanService { pqReasonableRangeDto = map.get(DataCleanEnum.Plt.getCode()); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { - 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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("plt{}", dto); } } return list; @@ -1602,18 +1644,22 @@ 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 (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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("pf{}", dto); } } return list; @@ -1653,6 +1699,8 @@ public class DataCleanServiceImpl implements IDataCleanService { ); list.add(pqDataVerify); } + }else { + logger.info("DataHarmPhasicV{}", dto); } } } @@ -1667,18 +1715,22 @@ 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 (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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("flus{}", dto); } } return list; @@ -1692,18 +1744,22 @@ 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 (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()); - list.add(pqDataVerify); + 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()); + list.add(pqDataVerify); + } + }else{ + logger.info("pst{}", dto); } } return list; diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java index 83669e4..6d29163 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java @@ -585,8 +585,12 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { // 获取 Overlimit 类的 getUharmx 方法 Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i); float limit = (float) getUharmMethod.invoke(overlimit); - if (value > limit) { - addAbnormalData(v[i - 2], item.getValueType(), item.getPhasicType(), item.getMinTime(), value, limit); + if (ObjectUtil.isNotNull(value)){ + if (value > limit) { + addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit); + } + }else{ + addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit); } } catch (Exception e) { e.printStackTrace(); @@ -727,7 +731,12 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { // 获取 Overlimit 类的 getUharmx 方法 Method getUharmMethod = Overlimit.class.getMethod("getUharm" + i); float limit = (float) getUharmMethod.invoke(overlimit); - if (value > limit) { + if (ObjectUtil.isNotNull(value)){ + if (value > limit) { + addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit); + } + }else{ + System.out.println(item); addAbnormalData(v[i - 2], item.getPhasicType(), item.getValueType(), item.getMinTime(), value, limit); } } catch (Exception e) {