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

1.bug修改

Browse Source
This commit is contained in:
wr
2024-02-20 16:04:42 +08:00
parent 7f3ae60701
commit 2d77e44795
12 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
View File

@@ -51,9 +51,6 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
private final RStatEventOrgMapper rStatEventOrgMapper;
private final RStatSubstationMapper rStatSubstationMapper;
private final DecimalFormat df = new DecimalFormat("###.0000");
private final DeptFeignClient deptFeignClient;
private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
@@ -108,17 +105,13 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
}
for (RStatOrgVO rStatOrgVO : result) {
if(rStatOrgVO.getEventMeasurementAverage()!=0&&rStatOrgVO.getEffectiveMeasurementAverage()!=0){
double v = Double.parseDouble(
df.format(((rStatOrgVO.getEventMeasurementAverage() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100));
BigDecimal round = NumberUtil.round(v, 2);
BigDecimal round = NumberUtil.round(((rStatOrgVO.getEventMeasurementAverage() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100, 2);
rStatOrgVO.setEventMeasurementRatioAverage(round.toString());
}else{
rStatOrgVO.setEventMeasurementRatioAverage("0");
}
if(rStatOrgVO.getEventMeasurementAccrued()!=0&&rStatOrgVO.getEffectiveMeasurementAccrued()!=0){
double v = Double.parseDouble(
df.format(((rStatOrgVO.getEventMeasurementAccrued() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100));
BigDecimal round = NumberUtil.round(v, 2);
BigDecimal round = NumberUtil.round(((rStatOrgVO.getEventMeasurementAccrued() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100, 2);
rStatOrgVO.setEventMeasurementRatioAccrued(round.toString());
}else{
rStatOrgVO.setEventMeasurementRatioAccrued("0");
@@ -201,12 +194,14 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
rStatEventOrgVO.setEventMeasurementAccrued(pos.get(0).getEventMeasurementAccrued());
if(rStatEventOrgVO.getEventMeasurementAverage()!=0&&rStatEventOrgVO.getEffectiveMeasurementAverage()!=0){
rStatEventOrgVO.setEventMeasurementRatioAverage(Double.parseDouble(df.format((pos.get(0).getEventMeasurementAverage() * 1.0) / (pos.get(0).getEffectiveMeasurementAverage() * 1.0))) * 100);
double v = (pos.get(0).getEventMeasurementAverage() * 1.0) / (pos.get(0).getEffectiveMeasurementAverage() * 1.0)*100;
rStatEventOrgVO.setEventMeasurementRatioAverage(NumberUtil.round(v,2).doubleValue());
}else{
rStatEventOrgVO.setEventMeasurementRatioAverage(0.0);
}
if(rStatEventOrgVO.getEventMeasurementAccrued()!=0&&rStatEventOrgVO.getEffectiveMeasurementAccrued()!=0){
rStatEventOrgVO.setEventMeasurementRatioAccrued(Double.parseDouble(df.format((pos.get(0).getEventMeasurementAccrued() * 1.0) / (pos.get(0).getEffectiveMeasurementAccrued() * 1.0))) * 100);
double v = (pos.get(0).getEventMeasurementAccrued() * 1.0) / (pos.get(0).getEffectiveMeasurementAccrued() * 1.0) * 100;
rStatEventOrgVO.setEventMeasurementRatioAccrued(NumberUtil.round(v,2).doubleValue());
}else{
rStatEventOrgVO.setEventMeasurementRatioAccrued(0.0);
}