修改算法
This commit is contained in:
@@ -155,15 +155,18 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
|
|||||||
freqCount++;
|
freqCount++;
|
||||||
}
|
}
|
||||||
/*,监测点的接线方式,如果是星形接线这个指标要判断,角形界面则不判断,默认它是正常的*/
|
/*,监测点的接线方式,如果是星形接线这个指标要判断,角形界面则不判断,默认它是正常的*/
|
||||||
if (Objects.equals("0", data.getPtType())) {
|
//河北没有线电压修改成先改成全部都是有效的线电压
|
||||||
if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
|
|
||||||
phaseVoltageCount++;
|
phaseVoltageCount++;
|
||||||
rmsflag = true;
|
rmsflag = true;
|
||||||
}
|
// if (Objects.equals("0", data.getPtType())) {
|
||||||
} else {
|
// if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
|
||||||
rmsflag = true;
|
// phaseVoltageCount++;
|
||||||
phaseVoltageCount++;
|
// rmsflag = true;
|
||||||
}
|
// }
|
||||||
|
// } else {
|
||||||
|
// rmsflag = true;
|
||||||
|
// phaseVoltageCount++;
|
||||||
|
// }
|
||||||
if (Objects.equals("1", data.getPtPhaseType())) {
|
if (Objects.equals("1", data.getPtPhaseType())) {
|
||||||
if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
|
if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
|
||||||
lineVoltageCount++;
|
lineVoltageCount++;
|
||||||
|
|||||||
Reference in New Issue
Block a user