报告单位调整

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/GetWindReportService.java

@@ -244,12 +244,12 @@ public class GetWindReportService {
         List<performance> performancesls = new ArrayList<>();
         performance performance = new performance();
         performance.setDbwd("月度发电量");
-        performance.setTop("1." + topIds[0] + "号：" + topFdl[0] + "万KWh；" +
-                "2." + topIds[1] + "号：" + topFdl[1] + "万KWh；" +
-                "3." + topIds[2] + "号：" + topFdl[2] + "万KWh；");
-        performance.setBottom("1." + bottomIds[0] + "号：" + bottomFdl[0] + "万KWh；" +
-                "2." + bottomIds[1] + "号：" + bottomFdl[1] + "万KWh；" +
-                "3." + bottomIds[2] + "号：" + bottomFdl[2] + "万KWh；");
+        performance.setTop("1." + topIds[0] + "号：" + topFdl[0] + "万kWh；" +
+                "2." + topIds[1] + "号：" + topFdl[1] + "万kWh；" +
+                "3." + topIds[2] + "号：" + topFdl[2] + "万kWh；");
+        performance.setBottom("1." + bottomIds[0] + "号：" + bottomFdl[0] + "万kWh；" +
+                "2." + bottomIds[1] + "号：" + bottomFdl[1] + "万kWh；" +
+                "3." + bottomIds[2] + "号：" + bottomFdl[2] + "万kWh；");
 
         performancesls.add(performance);
 
@@ -267,12 +267,12 @@ public class GetWindReportService {
 
         performance performance3 = new performance();
         performance3.setDbwd("月度损失电量");
-        performance3.setTop("1." + ssdltop3list.get(0).getStationId() + "号：" + StringUtils.round(ssdltop3list.get(0).getGzss() / bl, 2) + "万KWh；" +
-                "2." + ssdltop3list.get(1).getStationId() + "号：" + StringUtils.round(ssdltop3list.get(1).getGzss() / bl, 2) + "万KWh；" +
-                "3." + ssdltop3list.get(2).getStationId() + "号：" + StringUtils.round(ssdltop3list.get(2).getGzss() / bl, 2) + "万KWh；");
-        performance3.setBottom("1." + ssdlbottom3list.get(0).getStationId() + "号：" + StringUtils.round(ssdlbottom3list.get(0).getGzss() / bl, 2) + "万KWh；" +
-                "2." + ssdlbottom3list.get(1).getStationId() + "号：" + StringUtils.round(ssdlbottom3list.get(1).getGzss() / bl, 2) + "万KWh；" +
-                "3." + ssdlbottom3list.get(2).getStationId() + "号：" + StringUtils.round(ssdlbottom3list.get(2).getGzss() / bl, 2) + "万KWh；");
+        performance3.setTop("1." + ssdltop3list.get(0).getStationId() + "号：" + StringUtils.round(ssdltop3list.get(0).getGzss() / bl, 2) + "万kWh；" +
+                "2." + ssdltop3list.get(1).getStationId() + "号：" + StringUtils.round(ssdltop3list.get(1).getGzss() / bl, 2) + "万kWh；" +
+                "3." + ssdltop3list.get(2).getStationId() + "号：" + StringUtils.round(ssdltop3list.get(2).getGzss() / bl, 2) + "万kWh；");
+        performance3.setBottom("1." + ssdlbottom3list.get(0).getStationId() + "号：" + StringUtils.round(ssdlbottom3list.get(0).getGzss() / bl, 2) + "万kWh；" +
+                "2." + ssdlbottom3list.get(1).getStationId() + "号：" + StringUtils.round(ssdlbottom3list.get(1).getGzss() / bl, 2) + "万kWh；" +
+                "3." + ssdlbottom3list.get(2).getStationId() + "号：" + StringUtils.round(ssdlbottom3list.get(2).getGzss() / bl, 2) + "万kWh；");
 
         performancesls.add(performance3);
         map.put("performances", performancesls);
@@ -280,12 +280,12 @@ public class GetWindReportService {
         benchmark benchmark1 = new benchmark();
         benchmark1.setTargets("对标对象：选择" + topIds[0] + "号、" + topIds[1] + "号、" + topIds[2] + "号风机");
         benchmark1.setIndicator("对标指标：\n" +
-                "    单台发电量：" + topIds[0] + "号" + topFdl[0] + "万KWh、" + topIds[1] + "号" + topFdl[1] + "万KWh、" + topIds[2] + "号" + topFdl[2] + "万KWh\n" +
-                "    故障损失电量：" + topIds[0] + "号" + topGzssdl[0] + "万KWh、" + topIds[1] + "号" + topGzssdl[1] + "万KWh、" + topIds[2] + "号" + topGzssdl[2] + "万KWh\n" +
-                "    检修损失电量：" + topIds[0] + "号" + topJxssdl[0] + "万KWh、" + topIds[1] + "号" + topJxssdl[1] + "万KWh、" + topIds[2] + "号" + topJxssdl[2] + "万KWh\n" +
-                "    性能未达标损失电量：" + topIds[0] + "号" + topXnssdl[0] + "万KWh、" + topIds[1] + "号" + topXnssdl[1] + "万KWh、" + topIds[2] + "号" + topXnssdl[2] + "万KWh\n" +
-                "    限电损失电量：" + topIds[0] + "号" + topXdssdl[0] + "万KWh、" + topIds[1] + "号" + topXdssdl[1] + "万KWh、" + topIds[2] + "号" + topXdssdl[2] + "万KWh\n" +
-                "    受累损失电量：" + topIds[0] + "号" + topSlssdl[0] + "万KWh、" + topIds[1] + "号" + topSlssdl[1] + "万KWh、" + topIds[2] + "号" + topSlssdl[2] + "万KWh\n" +
+                "    单台发电量：" + topIds[0] + "号" + topFdl[0] + "万kWh、" + topIds[1] + "号" + topFdl[1] + "万kWh、" + topIds[2] + "号" + topFdl[2] + "万kWh\n" +
+                "    故障损失电量：" + topIds[0] + "号" + topGzssdl[0] + "万kWh、" + topIds[1] + "号" + topGzssdl[1] + "万kWh、" + topIds[2] + "号" + topGzssdl[2] + "万kWh\n" +
+                "    检修损失电量：" + topIds[0] + "号" + topJxssdl[0] + "万kWh、" + topIds[1] + "号" + topJxssdl[1] + "万kWh、" + topIds[2] + "号" + topJxssdl[2] + "万kWh\n" +
+                "    性能未达标损失电量：" + topIds[0] + "号" + topXnssdl[0] + "万kWh、" + topIds[1] + "号" + topXnssdl[1] + "万kWh、" + topIds[2] + "号" + topXnssdl[2] + "万kWh\n" +
+                "    限电损失电量：" + topIds[0] + "号" + topXdssdl[0] + "万kWh、" + topIds[1] + "号" + topXdssdl[1] + "万kWh、" + topIds[2] + "号" + topXdssdl[2] + "万kWh\n" +
+                "    受累损失电量：" + topIds[0] + "号" + topSlssdl[0] + "万kWh、" + topIds[1] + "号" + topSlssdl[1] + "万kWh、" + topIds[2] + "号" + topSlssdl[2] + "万kWh\n" +
                 "    风能利用率：" + topIds[0] + "号" + topFnlyl[0] + "%、" + topIds[1] + "号" + topFnlyl[1] + "%、" + topIds[2] + "号" + topFnlyl[2] + "%\n" +
                 "    故障损失率：" + topIds[0] + "号" + StringUtils.round(topGzssdl[0] / topLlfdl[0] * 100, 2) + "%、" + topIds[1] + "号" + StringUtils.round(topGzssdl[1] / topLlfdl[1] * 100, 2) + "%、" + topIds[2] + "号" + StringUtils.round(topGzssdl[2] / topLlfdl[2] * 100, 2) + "%\n" +
                 "    检修损失率：" + topIds[0] + "号" + StringUtils.round(topJxssdl[0] / topLlfdl[0] * 100, 2) + "%、" + topIds[1] + "号" + StringUtils.round(topJxssdl[1] / topLlfdl[1] * 100, 2) + "%、" + topIds[2] + "号" + StringUtils.round(topJxssdl[2] / topLlfdl[2] * 100, 2) + "%\n" +

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/WindReportService.java

@@ -259,18 +259,18 @@ public class WindReportService {
             bottomId[i] = dlbottomlist.get(i).getStationId() != null ? dlbottomlist.get(i).getStationId() : "";
         }
 
-//        map.put("发电量分析", "场站总发电量：月度" + monthfdl + "万KWh，年度" + yearfdl + "万KWh\n" +
-//                "理论发电量：月度" + monthllfdl + "万KWh，年度" + yearllfdl + "万KWh\n" +
-//                "单台风机平均发电量：月度" + month_dtpjFdl + "万KWh，年度" + year_dtpjFdl + "万KWh\n" +
-//                "发电量Top3风机：" + dltopId[0] + "号" + dltopFdl[0] + "万KWh、" + dltopId[1] + "号" + dltopFdl[1] + "万KWh、" + dltopId[2] + "号" + dltopFdl[2] + "万KWh\n" +
-//                "发电量末3风机：" + bottomId[0] + "号" + bottomFdl[0] + "万KWh、" + bottomId[1] + "号" + bottomFdl[1] + "万KWh、" + bottomId[2] + "号" + bottomFdl[2] + "万KWh\n" +
+//        map.put("发电量分析", "场站总发电量：月度" + monthfdl + "万kWh，年度" + yearfdl + "万kWh\n" +
+//                "理论发电量：月度" + monthllfdl + "万kWh，年度" + yearllfdl + "万kWh\n" +
+//                "单台风机平均发电量：月度" + month_dtpjFdl + "万kWh，年度" + year_dtpjFdl + "万kWh\n" +
+//                "发电量Top3风机：" + dltopId[0] + "号" + dltopFdl[0] + "万kWh、" + dltopId[1] + "号" + dltopFdl[1] + "万kWh、" + dltopId[2] + "号" + dltopFdl[2] + "万kWh\n" +
+//                "发电量末3风机：" + bottomId[0] + "号" + bottomFdl[0] + "万kWh、" + bottomId[1] + "号" + bottomFdl[1] + "万kWh、" + bottomId[2] + "号" + bottomFdl[2] + "万kWh\n" +
 //                "同比/环比分析：月度发电量同比" + monthfdltb + "%（±），环比" + monthfdlhb + "%（±）");
 
-        map.put("发电量分析-总发电量", "场站总发电量：月度" + monthfdl + "万KWh，年度" + yearfdl + "万KWh");
-        map.put("发电量分析-理论发电量","理论发电量：月度" + monthllfdl + "万KWh，年度" + yearllfdl + "万KWh");
-        map.put("发电量分析-单台平均","单台风机平均发电量：月度" + month_dtpjFdl + "万KWh，年度" + year_dtpjFdl + "万KWh");
-        map.put("发电量分析-Top3风机","发电量Top3风机：" + dltopId[0] + "号" + dltopFdl[0] + "万KWh、" + dltopId[1] + "号" + dltopFdl[1] + "万KWh、" + dltopId[2] + "号" + dltopFdl[2] + "万KWh");
-        map.put("发电量分析-末3风机","发电量末3风机：" + bottomId[0] + "号" + bottomFdl[0] + "万KWh、" + bottomId[1] + "号" + bottomFdl[1] + "万KWh、" + bottomId[2] + "号" + bottomFdl[2] + "万KWh");
+        map.put("发电量分析-总发电量", "场站总发电量：月度" + monthfdl + "万kWh，年度" + yearfdl + "万kWh");
+        map.put("发电量分析-理论发电量","理论发电量：月度" + monthllfdl + "万kWh，年度" + yearllfdl + "万kWh");
+        map.put("发电量分析-单台平均","单台风机平均发电量：月度" + month_dtpjFdl + "万kWh，年度" + year_dtpjFdl + "万kWh");
+        map.put("发电量分析-Top3风机","发电量Top3风机：" + dltopId[0] + "号" + dltopFdl[0] + "万kWh、" + dltopId[1] + "号" + dltopFdl[1] + "万kWh、" + dltopId[2] + "号" + dltopFdl[2] + "万kWh");
+        map.put("发电量分析-末3风机","发电量末3风机：" + bottomId[0] + "号" + bottomFdl[0] + "万kWh、" + bottomId[1] + "号" + bottomFdl[1] + "万kWh、" + bottomId[2] + "号" + bottomFdl[2] + "万kWh");
         map.put("发电量分析-同比分析","同比/环比分析：月度发电量同比" + monthfdltb + "%（±），环比" + monthfdlhb + "%（±）");
 
         //月场用电量
@@ -300,13 +300,13 @@ public class WindReportService {
         double monthcydlltb = qnmonthcydll > 1 ? StringUtils.round((monthcydll - qnmonthcydll) / qnmonthcydll * 100, 2) : 0.0;
 
 
-//        map.put("综合场用电量分析", "月度场用电量：" + monthcydl + "万KWh\n" +
-//                "年度场用电量：" + yearcydl + "万KWh\n" +
+//        map.put("综合场用电量分析", "月度场用电量：" + monthcydl + "万kWh\n" +
+//                "年度场用电量：" + yearcydl + "万kWh\n" +
 //                "场用电率：月度" + monthcydll + "%，年度" + yearcydll + "%\n" +
 //                "与同期对比：月度场用电量同比" + monthcydltb + "%（±），场用电率同比" + monthcydlltb + "%（±）");
 
-        map.put("综合场用电量分析-月度场用电量","月度场用电量：" + monthcydl + "万KWh");
-        map.put("综合场用电量分析-年度场用电量","年度场用电量：" + yearcydl + "万KWh");
+        map.put("综合场用电量分析-月度场用电量","月度场用电量：" + monthcydl + "万kWh");
+        map.put("综合场用电量分析-年度场用电量","年度场用电量：" + yearcydl + "万kWh");
         map.put("综合场用电量分析-场用电率","场用电率：月度" + monthcydll + "%，年度" + yearcydll + "%");
         map.put("综合场用电量分析-与同期对比","与同期对比：月度场用电量同比" + monthcydltb + "%（±），场用电率同比" + monthcydlltb + "%（±）");