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 6bfa46c..5c8ad11 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 @@ -1353,28 +1353,31 @@ 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() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getRms() > (pqReasonableRangeDto.getMaxValue() / 100.0 * 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); + //相电压有效值 判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压 角型或者v型是线电压 + //0:星型接法;1:三角型接法;2:开口三角型接法 + if (ObjectUtil.isNotNull(line.getPtType()) && line.getPtType() == 0) { + 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() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getRms() > (pqReasonableRangeDto.getMaxValue() / 100.0 * 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); } - } else { - logger.info("rmsV{}", dto); } } @@ -1477,24 +1480,27 @@ 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() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel())) - || dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue() / 100.0 * 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())); - list.add(pqDataVerify); + //线电压有效值 判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压 角型或者v型是线电压 + //0:星型接法;1:三角型接法;2:开口三角型接法 + if (ObjectUtil.isNotNull(line.getPtType()) && line.getPtType() != 0) { + 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() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel())) + || dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue() / 100.0 * 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())); + list.add(pqDataVerify); + } } } @@ -1647,7 +1653,7 @@ public class DataCleanServiceImpl implements IDataCleanService { phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); if (phaseList.contains(dto.getPhasicType())) { if (ObjectUtil.isNotNull(dto.getRms())) { - if (dto.getRms() >= line.getCT1() * 1.2) { + if (dto.getRms() < pqReasonableRangeDto.getMinValue() || dto.getRms() > pqReasonableRangeDto.getMaxValue()) { PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId() , dto.getMinTime() , dto.getValueType()