修改算法

This commit is contained in:
huangzj
2023-11-21 18:13:09 +08:00
parent 41a0e62953
commit 7ac58df780

View File

@@ -150,23 +150,23 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
rOperatingMonitorDPO.setDataDate (localDate); rOperatingMonitorDPO.setDataDate (localDate);
rOperatingMonitorDPO.setIsUnusual (rStatAbnormalDPO.getValueAlarm ()); rOperatingMonitorDPO.setIsUnusual (rStatAbnormalDPO.getValueAlarm ());
rOperatingMonitorDPO.setEffectiveMinuteCount (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()); rOperatingMonitorDPO.setEffectiveMinuteCount (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ());
rOperatingMonitorDPO.setDataIntegrityRate (BigDecimal.valueOf (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()*statisticalInterval/1440)); rOperatingMonitorDPO.setDataIntegrityRate (BigDecimal.valueOf (Double.valueOf(rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()*statisticalInterval)/1440).setScale(2, BigDecimal.ROUND_HALF_UP));
if(rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()==0){ if(rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()==0){
rOperatingMonitorDPO.setDataRightRate(BigDecimal.valueOf(0.00)); rOperatingMonitorDPO.setDataRightRate(BigDecimal.valueOf(0.00));
}else{ }else{
rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf( rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
(rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+ (Double.valueOf(rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+ rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+
rMpMonitorEvaluateDPO.getVThdCount ())/(5*rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()) rMpMonitorEvaluateDPO.getVThdCount ()))/(5*rMpMonitorEvaluateDPO.getEffectiveMinuteCount ())
)); ).setScale(2, BigDecimal.ROUND_HALF_UP));
} }
rOperatingMonitorDPO.setIndexIntegrityRate ( rOperatingMonitorDPO.setIndexIntegrityRate (
BigDecimal.valueOf( BigDecimal.valueOf(
(rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+ (Double.valueOf(rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+ rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+
rMpMonitorEvaluateDPO.getVThdCount ())*statisticalInterval/(5*1440) rMpMonitorEvaluateDPO.getVThdCount ())*statisticalInterval)/(5*1440)
) ).setScale(2, BigDecimal.ROUND_HALF_UP)
); );
rOperatingMonitorDPO.setDevId (lineDTO.getDevId()); rOperatingMonitorDPO.setDevId (lineDTO.getDevId());
rOperatingMonitorDPO.setMonitorState("0"); rOperatingMonitorDPO.setMonitorState("0");