算法调整

This commit is contained in:
xy
2025-12-17 10:39:42 +08:00
parent 6b21e9927a
commit 713db187c5

View File

@@ -1353,7 +1353,9 @@ public class DataCleanServiceImpl implements IDataCleanService {
} }
} }
//相电压有效值 //相电压有效值 判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压 角型或者v型是线电压
//0:星型接法;1:三角型接法;2:开口三角型接法
if (ObjectUtil.isNotNull(line.getPtType()) && line.getPtType() == 0) {
pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.RmsV.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType())) { if (phaseList.contains(dto.getPhasicType())) {
@@ -1377,6 +1379,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
logger.info("rmsV{}", dto); logger.info("rmsV{}", dto);
} }
} }
}
//正序电压 //正序电压
pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode());
@@ -1477,7 +1480,9 @@ public class DataCleanServiceImpl implements IDataCleanService {
} }
} }
//线电压有效值 //线电压有效值 判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压 角型或者v型是线电压
//0:星型接法;1:三角型接法;2:开口三角型接法
if (ObjectUtil.isNotNull(line.getPtType()) && line.getPtType() != 0) {
pqReasonableRangeDto = map.get(DataCleanEnum.RmsLvr.getCode()); pqReasonableRangeDto = map.get(DataCleanEnum.RmsLvr.getCode());
phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(",")); phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
if (phaseList.contains(dto.getPhasicType()) && ObjectUtil.isNotNull(dto.getRmsLvr())) { if (phaseList.contains(dto.getPhasicType()) && ObjectUtil.isNotNull(dto.getRmsLvr())) {
@@ -1497,6 +1502,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
list.add(pqDataVerify); list.add(pqDataVerify);
} }
} }
}
//电压偏差 //电压偏差
//电压偏差分为正偏差和负偏差目前正负偏差都存储在vu_dev字段中如果vu_dev>=0为正偏差数值如果vu_dev<0为负偏差数值 //电压偏差分为正偏差和负偏差目前正负偏差都存储在vu_dev字段中如果vu_dev>=0为正偏差数值如果vu_dev<0为负偏差数值
@@ -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()