算法修改

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