监测点评价有效数据校验放开

This commit is contained in:
hzj
2024-11-07 09:05:05 +08:00
parent 6cd45fd7f9
commit 91b3f63b99

View File

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