Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug调整

Browse Source
This commit is contained in:
xuyang
2023-11-21 14:23:49 +08:00
parent 23a47892d0
commit 41a0e62953
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatLoadTypeMMapper.xml
View File

@@ -24,15 +24,15 @@
org_no,
load_type,
v_average,
ROUND( v_count / effective_measurement, 2 ) AS vAccrued,
(case when effective_measurement = 0 then 0 else ROUND( v_count / effective_measurement, 2 ) end) as vAccrued,
i_average,
ROUND( i_count / effective_measurement, 2 ) AS iAccrued,
(case when effective_measurement = 0 then 0 else ROUND( i_count / effective_measurement, 2 ) end) as iAccrued,
unbalance_average,
ROUND( unbalance_count / effective_measurement, 2 ) AS unbalanceAccrued,
(case when effective_measurement = 0 then 0 else ROUND( unbalance_count / effective_measurement, 2 ) end) as unbalanceAccrued,
i_neg_average,
ROUND( i_neg_count / effective_measurement, 2 ) AS iNegAccrued,
(case when effective_measurement = 0 then 0 else ROUND( i_neg_count / effective_measurement, 2 ) end) as iNegAccrued,
flicker_average,
ROUND( flicker_count / effective_measurement, 2 ) AS flickerAccrued
(case when effective_measurement = 0 then 0 else ROUND( flicker_count / effective_measurement, 2 ) end) as flickerAccrued
from
r_stat_load_type_m
<where>

9
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java
View File

@@ -224,10 +224,11 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
rIconVO.setOverLimitMeasurementAverage(value.getOverLimitMeasurementAverage());
rIconVO.setOverLimitMeasurementRatioAccrued(value.getOverLimitMeasurementRatioAccrued());
rIconVO.setOverLimitMeasurementRatioAverage(value.getOverLimitMeasurementRatioAverage());
DecimalFormat df = new DecimalFormat("###.00");
Float averageOverDay = Float.parseFloat(
df.format(value.getOverDay() / (value.getOverLimitMeasurementAccrued() * 1.0)));
rIconVO.setAverageOverDay(averageOverDay);
// DecimalFormat df = new DecimalFormat("###.00");
// Float averageOverDay = Float.parseFloat(
// df.format(value.getOverDay() / (value.getOverLimitMeasurementAccrued() * 1.0)));
Float averageOverDay = (float)value.getOverDay()/value.getOverLimitMeasurementAccrued();
rIconVO.setAverageOverDay(Float.parseFloat(String.format("%.2f", averageOverDay)));
arrayVOList.add(rIconVO);
}
});