算法修改

This commit is contained in:
hzj
2024-02-01 15:06:38 +08:00
parent ae04eb131e
commit 8f66412c60

View File

@@ -195,56 +195,63 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
Boolean rmsLvrflag = false;
Boolean vUnbalanceflag = false;
if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit()) {
freqCount++;
}
/*,监测点的接线方式,如果是星形接线这个指标要判断,角形界面则不判断,默认它是正常的*/
if (Objects.equals("0", data.getPtType())) {
if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
phaseVoltageCount++;
rmsflag = true;
}
} else {
rmsflag = true;
phaseVoltageCount++;
}
if (Objects.equals("1", data.getPtPhaseType())) {
if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
lineVoltageCount++;
rmsLvrflag = true;
}
} else {
rmsLvrflag = true;
lineVoltageCount++;
}
if (Objects.equals("1", data.getPtPhaseType()) && Objects.equals("0", data.getPtType())) {
if (v_unbalanceLimit.getLowerLimit() <= vUnbalanceMin && vUnbalanceMax <= v_unbalanceLimit.getUpperLimit()
) {
unbalanceCount++;
vUnbalanceflag = true;
}
} else {
unbalanceCount++;
vUnbalanceflag = true;
}
if (v_thdLimit.getLowerLimit() <= vThdMin && vThdMax <= v_thdLimit.getUpperLimit()) {
phaseVoltageCount++;
lineVoltageCount++;
vThdCount++;
}
if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit() &&
rmsflag &&
rmsLvrflag &&
v_thdLimit.getLowerLimit() <= vThdMin && vThdMax <= v_thdLimit.getUpperLimit() &&
vUnbalanceflag
) {
effectiveMinuteCount++;
}
// 先注释掉 校验跑出监测点
// if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit()) {
// freqCount++;
// }
// /*,监测点的接线方式,如果是星形接线这个指标要判断,角形界面则不判断,默认它是正常的*/
// if (Objects.equals("0", data.getPtType())) {
// if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
// phaseVoltageCount++;
// rmsflag = true;
// }
// } else {
// rmsflag = true;
// phaseVoltageCount++;
// }
// if (Objects.equals("1", data.getPtPhaseType())) {
// if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
// lineVoltageCount++;
// rmsLvrflag = true;
// }
//
// } else {
// rmsLvrflag = true;
// lineVoltageCount++;
//
// }
// if (Objects.equals("1", data.getPtPhaseType()) && Objects.equals("0", data.getPtType())) {
// if (v_unbalanceLimit.getLowerLimit() <= vUnbalanceMin && vUnbalanceMax <= v_unbalanceLimit.getUpperLimit()
// ) {
// unbalanceCount++;
// vUnbalanceflag = true;
// }
// } else {
// unbalanceCount++;
// vUnbalanceflag = true;
// }
//
//
// if (v_thdLimit.getLowerLimit() <= vThdMin && vThdMax <= v_thdLimit.getUpperLimit()) {
// vThdCount++;
// }
//
//
// if (freqLimit.getLowerLimit() <= freqMin && freqMax <= freqLimit.getUpperLimit() &&
// rmsflag &&
// rmsLvrflag &&
// v_thdLimit.getLowerLimit() <= vThdMin && vThdMax <= v_thdLimit.getUpperLimit() &&
// vUnbalanceflag
//
// ) {
// effectiveMinuteCount++;
// }
}
}