算法调整
This commit is contained in:
@@ -1353,28 +1353,31 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//相电压有效值
|
//相电压有效值 判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压 角型或者v型是线电压
|
||||||
pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode());
|
//0:星型接法;1:三角型接法;2:开口三角型接法
|
||||||
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
if (ObjectUtil.isNotNull(line.getPtType()) && line.getPtType() == 0) {
|
||||||
if (phaseList.contains(dto.getPhasicType())) {
|
pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode());
|
||||||
if (ObjectUtil.isNotNull(dto.getRms())) {
|
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||||
if (dto.getRms() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
|
if (phaseList.contains(dto.getPhasicType())) {
|
||||||
|| dto.getRms() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
|
if (ObjectUtil.isNotNull(dto.getRms())) {
|
||||||
//log.info("dataV-相电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRms(), dto.getMinTime());
|
if (dto.getRms() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
|
||||||
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
|| dto.getRms() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
|
||||||
, dto.getMinTime()
|
//log.info("dataV-相电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRms(), dto.getMinTime());
|
||||||
, dto.getValueType()
|
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
||||||
, dto.getPhasicType()
|
, dto.getMinTime()
|
||||||
, pqReasonableRangeDto.getIndexCode()
|
, dto.getValueType()
|
||||||
, pqReasonableRangeDto.getIndexName()
|
, dto.getPhasicType()
|
||||||
, pqReasonableRangeDto.getInfluxdbTableName()
|
, pqReasonableRangeDto.getIndexCode()
|
||||||
, dto.getRms()
|
, pqReasonableRangeDto.getIndexName()
|
||||||
, pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())
|
, pqReasonableRangeDto.getInfluxdbTableName()
|
||||||
, pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()));
|
, dto.getRms()
|
||||||
list.add(pqDataVerify);
|
, 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 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//线电压有效值
|
//线电压有效值 判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压 角型或者v型是线电压
|
||||||
pqReasonableRangeDto = map.get(DataCleanEnum.RmsLvr.getCode());
|
//0:星型接法;1:三角型接法;2:开口三角型接法
|
||||||
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
if (ObjectUtil.isNotNull(line.getPtType()) && line.getPtType() != 0) {
|
||||||
if (phaseList.contains(dto.getPhasicType()) && ObjectUtil.isNotNull(dto.getRmsLvr())) {
|
pqReasonableRangeDto = map.get(DataCleanEnum.RmsLvr.getCode());
|
||||||
if (dto.getRmsLvr() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
|
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||||
|| dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
|
if (phaseList.contains(dto.getPhasicType()) && ObjectUtil.isNotNull(dto.getRmsLvr())) {
|
||||||
//log.info("dataV-线电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRmsLvr(), dto.getMinTime());
|
if (dto.getRmsLvr() < (pqReasonableRangeDto.getMinValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))
|
||||||
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
|| dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue() / 100.0 * DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
|
||||||
, dto.getMinTime()
|
//log.info("dataV-线电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRmsLvr(), dto.getMinTime());
|
||||||
, dto.getValueType()
|
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
||||||
, dto.getPhasicType()
|
, dto.getMinTime()
|
||||||
, pqReasonableRangeDto.getIndexCode()
|
, dto.getValueType()
|
||||||
, pqReasonableRangeDto.getIndexName()
|
, dto.getPhasicType()
|
||||||
, pqReasonableRangeDto.getInfluxdbTableName()
|
, pqReasonableRangeDto.getIndexCode()
|
||||||
, dto.getRmsLvr()
|
, pqReasonableRangeDto.getIndexName()
|
||||||
, pqReasonableRangeDto.getMinValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel())
|
, pqReasonableRangeDto.getInfluxdbTableName()
|
||||||
, pqReasonableRangeDto.getMaxValue() * DataCommonUtils.getVoltageData(line.getVoltageLevel()));
|
, dto.getRmsLvr()
|
||||||
list.add(pqDataVerify);
|
, 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(","));
|
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||||
if (phaseList.contains(dto.getPhasicType())) {
|
if (phaseList.contains(dto.getPhasicType())) {
|
||||||
if (ObjectUtil.isNotNull(dto.getRms())) {
|
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()
|
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
||||||
, dto.getMinTime()
|
, dto.getMinTime()
|
||||||
, dto.getValueType()
|
, dto.getValueType()
|
||||||
|
|||||||
Reference in New Issue
Block a user