算法调整
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.njcn.algorithm.serviceimpl.line;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.njcn.algorithm.pojo.bo.CalculatedParam;
|
||||
import com.njcn.algorithm.service.line.IDataCleanService;
|
||||
import com.njcn.dataProcess.api.*;
|
||||
@@ -547,11 +548,14 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
}
|
||||
}
|
||||
|
||||
//线电压正偏差
|
||||
//电压偏差
|
||||
//电压偏差分为正偏差和负偏差,目前正负偏差都存储在vu_dev字段中,如果vu_dev>=0为正偏差数值,如果vu_dev<0为负偏差数值
|
||||
if (ObjectUtil.isNotNull(dto.getVuDev())) {
|
||||
if (dto.getVuDev() >= 0) {
|
||||
pqReasonableRangeDto = map.get(DataCleanEnum.VuDev.getCode());
|
||||
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||
if (phaseList.contains(dto.getPhasicType())) {
|
||||
if (dto.getVuDev() < pqReasonableRangeDto.getMinValue() || dto.getVuDev() > pqReasonableRangeDto.getMaxValue()) {
|
||||
if (dto.getVuDev() > pqReasonableRangeDto.getMaxValue()) {
|
||||
//log.info("dataV-线电压正偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getVuDev(), dto.getMinTime());
|
||||
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
||||
,dto.getMinTime()
|
||||
@@ -566,12 +570,11 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
list.add(pqDataVerify);
|
||||
}
|
||||
}
|
||||
|
||||
//线电压负偏差
|
||||
} else {
|
||||
pqReasonableRangeDto = map.get(DataCleanEnum.VlDev.getCode());
|
||||
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||
if (phaseList.contains(dto.getPhasicType())) {
|
||||
if (dto.getVlDev() < pqReasonableRangeDto.getMinValue() || dto.getVlDev() > pqReasonableRangeDto.getMaxValue()) {
|
||||
if (dto.getVuDev() < pqReasonableRangeDto.getMinValue()) {
|
||||
//log.info("dataV-线电压负偏差数据异常,已清洗!数据值:{},数据时间:{}", dto.getVlDev(), dto.getMinTime());
|
||||
PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
|
||||
,dto.getMinTime()
|
||||
@@ -580,12 +583,54 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
,pqReasonableRangeDto.getIndexCode()
|
||||
,pqReasonableRangeDto.getIndexName()
|
||||
,pqReasonableRangeDto.getInfluxdbTableName()
|
||||
,dto.getVlDev()
|
||||
,dto.getVuDev()
|
||||
,pqReasonableRangeDto.getMinValue()
|
||||
,pqReasonableRangeDto.getMaxValue());
|
||||
list.add(pqDataVerify);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// //线电压正偏差
|
||||
// pqReasonableRangeDto = map.get(DataCleanEnum.VuDev.getCode());
|
||||
// phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||
// if (phaseList.contains(dto.getPhasicType())) {
|
||||
// if (dto.getVuDev() < pqReasonableRangeDto.getMinValue() || 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());
|
||||
// list.add(pqDataVerify);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// //线电压负偏差
|
||||
// pqReasonableRangeDto = map.get(DataCleanEnum.VlDev.getCode());
|
||||
// phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
|
||||
// if (phaseList.contains(dto.getPhasicType())) {
|
||||
// if (dto.getVlDev() < pqReasonableRangeDto.getMinValue() || dto.getVlDev() > pqReasonableRangeDto.getMaxValue()) {
|
||||
// //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.getVlDev()
|
||||
// ,pqReasonableRangeDto.getMinValue()
|
||||
// ,pqReasonableRangeDto.getMaxValue());
|
||||
// list.add(pqDataVerify);
|
||||
// }
|
||||
// }
|
||||
|
||||
//电压总谐波畸变率
|
||||
pqReasonableRangeDto = map.get(DataCleanEnum.VThd.getCode());
|
||||
|
||||
Reference in New Issue
Block a user