|
@@ -138,10 +138,10 @@ public class ReportService {
|
|
result.add(createIndicatorData("静风频率", currentCalmWindFrequency, lastYearCalmWindFrequency));
|
|
result.add(createIndicatorData("静风频率", currentCalmWindFrequency, lastYearCalmWindFrequency));
|
|
map.put("lb", result);
|
|
map.put("lb", result);
|
|
|
|
|
|
- double fdlzzl = calculateGrowthRate(currentPower, lastYearPower);//发电量增长率
|
|
|
|
- double ssdllj = currentFaultLossPower + currentDispatchLossPower + currentPlannedMaintenanceLossPower + currentPerformanceLossPower; //损失电量合计
|
|
|
|
- double tqssdllj = lastYearFaultLossPower + lastYearDispatchLossPower + lastYearPlannedMaintenanceLossPower + lastYearPerformanceLossPower;//同期损失电量合计
|
|
|
|
- double ssdlzzl = calculateGrowthRate(ssdllj, tqssdllj);
|
|
|
|
|
|
+ double fdlzzl = DoubleUtils.getRoundingNum(calculateGrowthRate(currentPower, lastYearPower),2);//发电量增长率
|
|
|
|
+ double ssdllj = DoubleUtils.getRoundingNum(currentFaultLossPower + currentDispatchLossPower + currentPlannedMaintenanceLossPower + currentPerformanceLossPower,2); //损失电量合计
|
|
|
|
+ double tqssdllj = DoubleUtils.getRoundingNum(lastYearFaultLossPower + lastYearDispatchLossPower + lastYearPlannedMaintenanceLossPower + lastYearPerformanceLossPower,2);//同期损失电量合计
|
|
|
|
+ double ssdlzzl = DoubleUtils.getRoundingNum(calculateGrowthRate(ssdllj, tqssdllj),2);
|
|
double dlxc = DoubleUtils.getRoundingNum(currentPower - currentTheoryPower, 2);
|
|
double dlxc = DoubleUtils.getRoundingNum(currentPower - currentTheoryPower, 2);
|
|
String wz1 = "本月" + collect.get(0).getNemCode() + "风机设备利用小时数" + currentUtilization + "小时、同比" + lastYearUtilization + "小时," +
|
|
String wz1 = "本月" + collect.get(0).getNemCode() + "风机设备利用小时数" + currentUtilization + "小时、同比" + lastYearUtilization + "小时," +
|
|
"设备可利用率" + currentEquipmentUtilization + "%、同比" + lastYearEquipmentUtilization + "%,等效可用系数" + currentEfficiencyCoefficient + "%、同比" + lastYearEfficiencyCoefficient + "%," +
|
|
"设备可利用率" + currentEquipmentUtilization + "%、同比" + lastYearEquipmentUtilization + "%,等效可用系数" + currentEfficiencyCoefficient + "%、同比" + lastYearEfficiencyCoefficient + "%," +
|