报告中一些bug修复

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

@@ -210,16 +210,16 @@ public class WindReportService {
         map.put("MTBF", "MTBF（平均无故障时间）：月度" + monthdmtbf + "h，与上年同期对比±" + mtbftq + "%");
         map.put("MTTR", "MTTR（平均修复时间）：月度" + monthdmttr + "h，与上年同期对比±" + mttrtq + "%");
         map.put("风机可利用率", "风机可利用率：\n" +
-                "场站平均可利用率：月度" + monthkyly + "%，年度" + yearklyly + "%\n" +
-                "可利用率Top3风机：" + klyltop1id + "号" + klyltop1value + "%、" + klyltop2id + "号" + klyltop2value + "%、" + klyltop3id + "号" + klyltop3value + "%\n" +
-                "可利用率末3风机：" + klylbottom1id + "号" + klylbottom1value + "%、" + klylbottom2id + "号" + klylbottom2value + "%、" + klylbottom3id + "号" + klylbottom3value + "%");
+                "    场站平均可利用率：月度" + monthkyly + "%，年度" + yearklyly + "%\n" +
+                "    可利用率Top3风机：" + klyltop1id + "号" + klyltop1value + "%、" + klyltop2id + "号" + klyltop2value + "%、" + klyltop3id + "号" + klyltop3value + "%\n" +
+                "    可利用率末3风机：" + klylbottom1id + "号" + klylbottom1value + "%、" + klylbottom2id + "号" + klylbottom2value + "%、" + klylbottom3id + "号" + klylbottom3value + "%");
 
         int gzcs = !gzcslist.isEmpty() ? gzcslist.get(0).getGzcs() : 0;
         String gzfj = !gzcstop.isEmpty() ? gzcstop.get(0).getStationId() : "";
         int gzfjcs = !gzcstop.isEmpty() ? gzcstop.get(0).getGzcs() : 0;
         map.put("故障统计", "故障统计：\n" +
-                "月度总故障次数：" + gzcs + "次\n" +
-                "故障频发风机：" + gzfj + "号（" + gzfjcs + "次）");
+                "    月度总故障次数：" + gzcs + "次\n" +
+                "    故障频发风机：" + gzfj + "号（" + gzfjcs + "次）");
 
 
         double monthfdl = !monthdllist.isEmpty() ? StringUtils.round(monthdllist.get(0).getRfdl() / bl, 2) : 0.0;
@@ -356,9 +356,9 @@ public class WindReportService {
 //                "历史对比：与去年同期相比，平均风速" + tqb_avgfs + "m/s（±），静风频率" + tqb_jfpl + "%（±）");
 
         map.put("风资源分析-风资源数据","风资源数据：\n" +
-                        "平均风速：" + avgfs + "m/s\n" +
-                        "主导风向：" + avgfx + "\n" +
-                        "静风频率：" + avgjfpl + "%");
+                        "    平均风速：" + avgfs + "m/s\n" +
+                        "    主导风向：" + avgfx + "\n" +
+                        "    静风频率：" + avgjfpl + "%");
         map.put("风资源分析-历史对比","历史对比：与去年同期相比，平均风速" + tqb_avgfs + "m/s（±），静风频率" + tqb_jfpl + "%（±）");
 
         String[] qxtopid = new String[3];
@@ -371,9 +371,9 @@ public class WindReportService {
         }
 
         map.put("曲线偏差率分析", "偏差率排行（排名前三）：\n" +
-                "" + qxtopid[0] + "号风机：偏差率" + qxpcl[0] + "%，排名: 1\n" +
-                "" + qxtopid[1] + "号风机：偏差率" + qxpcl[1] + "%，排名: 2\n" +
-                "" + qxtopid[2] + "号风机：偏差率" + qxpcl[2] + "%，排名: 3");
+                "    " + qxtopid[0] + "号风机：偏差率" + qxpcl[0] + "%，排名: 1\n" +
+                "    " + qxtopid[1] + "号风机：偏差率" + qxpcl[1] + "%，排名: 2\n" +
+                "    " + qxtopid[2] + "号风机：偏差率" + qxpcl[2] + "%，排名: 3");
 
        String min_35Id = pcllist.get("min_r35_nem_code").toString() !=null ? pcllist.get("min_r35_nem_code").toString() :"";
        String max_35Id = pcllist.get("max_r35_nem_code").toString() !=null ? pcllist.get("max_r35_nem_code").toString() :"";
@@ -389,9 +389,9 @@ public class WindReportService {
         double avgR11mycqxpcl = getpcllist.get("avg_r11mycqxpcl") != null ? ((Number) getpcllist.get("avg_r11mycqxpcl")).doubleValue() : 0.0;
 
         map.put("各区间偏差率统计", "各区间偏差率统计：\n" +
-                "3-5m/s区间：平均偏差率" + StringUtils.round(avgR35mqxpcl, 2) + "%，偏差率最大风机：" + max_35Id + "号，偏差率最小风机：" + min_35Id + "号\n" +
-                "5-11m/s区间：平均偏差率" + StringUtils.round(avgR511mqxpcl, 2) + "%，偏差率最大风机：" + max_511Id + "号，偏差率最小风机：" + min_511Id + "号\n" +
-                "11-25m/s区间：平均偏差率" + StringUtils.round(avgR11mycqxpcl, 2) + "%，偏差率最大风机：" + max_1125Id + "号，偏差率最小风机：" + min_1125Id + "号");
+                "    3-5m/s区间：平均偏差率" + StringUtils.round(avgR35mqxpcl, 2) + "%，偏差率最大风机：" + max_35Id + "号，偏差率最小风机：" + min_35Id + "号\n" +
+                "    5-11m/s区间：平均偏差率" + StringUtils.round(avgR511mqxpcl, 2) + "%，偏差率最大风机：" + max_511Id + "号，偏差率最小风机：" + min_511Id + "号\n" +
+                "    11-25m/s区间：平均偏差率" + StringUtils.round(avgR11mycqxpcl, 2) + "%，偏差率最大风机：" + max_1125Id + "号，偏差率最小风机：" + min_1125Id + "号");
 
         String[] yqrtopid = new String[3];
         double[] yqrfs = new double[3];
@@ -404,9 +404,9 @@ public class WindReportService {
             yqcfs[i] = StringUtils.round(item.getMonthOutputSmall(), 2);
         }
         map.put("单台风速分析", "单台风速分析（月小风切入合格率排名前三）：\n" +
-                "" + yqrtopid[0] + "号风机：月度小风切入风速" + yqrfs[0] + "m/s、小风切出风速" + yqcfs[0] + "m/s\n" +
-                "" + yqrtopid[1] + "号风机：月度小风切入风速" + yqrfs[1] + "m/s、小风切出风速" + yqcfs[1] + "m/s\n" +
-                "" + yqrtopid[2] + "号风机：月度小风切入风速" + yqrfs[2] + "m/s、小风切出风速" + yqcfs[2] + "m/s");
+                "    " + yqrtopid[0] + "号风机：月度小风切入风速" + yqrfs[0] + "m/s、小风切出风速" + yqcfs[0] + "m/s\n" +
+                "    " + yqrtopid[1] + "号风机：月度小风切入风速" + yqrfs[1] + "m/s、小风切出风速" + yqcfs[1] + "m/s\n" +
+                "    " + yqrtopid[2] + "号风机：月度小风切入风速" + yqrfs[2] + "m/s、小风切出风速" + yqcfs[2] + "m/s");
 
 
         double average = 0.0;
@@ -431,9 +431,9 @@ public class WindReportService {
                 .collect(Collectors.joining(","));
 
         map.put("合格率计算", "合格率计算：\n" +
-                "50台风机平均切入切出合格率" + StringUtils.round(average, 2) + "%\n" +
-                "合格率100%的风机：" + out_100.size() + "台，为" + out100_id + "\n" +
-                "合格率低于60%的风机：" + out_60.size() + "台,为" + out60_id + "");
+                "    50台风机平均切入切出合格率" + StringUtils.round(average, 2) + "%\n" +
+                "    合格率100%的风机：" + out_100.size() + "台，为" + out100_id + "\n" +
+                "    合格率低于60%的风机：" + out_60.size() + "台,为" + out60_id + "");
 
         String[] topnhyd_id = new String[3];
         Arrays.fill(topnhyd_id, "");
@@ -476,12 +476,12 @@ public class WindReportService {
 //                "月拟合优度末3：" + sybottomnhyd_id[0] + "号" + sybottom_ynhyd[0] + "%、" + sybottomnhyd_id[1] + "号" + sybottom_ynhyd[1] + "%、" + sybottomnhyd_id[2] + "号" + sybottom_ynhyd[2] + "%");
 
         map.put("拟合优度排行","拟合优度排行：\n" +
-                "月拟合优度Top3：" + topnhyd_id[0] + "号" + top_ynhyd[0] + "%、" + topnhyd_id[1] + "号" + top_ynhyd[1] + "%、" + topnhyd_id[2] + "号" + top_ynhyd[2] + "%\n" +
-                "月拟合优度末3：" + bottomnhyd_id[0] + "号" + bottom_ynhyd[0] + "%、" + bottomnhyd_id[1] + "号" + bottom_ynhyd[2] + "%、" + bottomnhyd_id[2] + "号" + bottom_ynhyd[2] + "%");
+                "    月拟合优度Top3：" + topnhyd_id[0] + "号" + top_ynhyd[0] + "%、" + topnhyd_id[1] + "号" + top_ynhyd[1] + "%、" + topnhyd_id[2] + "号" + top_ynhyd[2] + "%\n" +
+                "    月拟合优度末3：" + bottomnhyd_id[0] + "号" + bottom_ynhyd[0] + "%、" + bottomnhyd_id[1] + "号" + bottom_ynhyd[2] + "%、" + bottomnhyd_id[2] + "号" + bottom_ynhyd[2] + "%");
 
         map.put("拟合优度排行—上月","拟合优度排行—上月：\n" +
-                "月拟合优度Top3：" + sytopnhyd_id[0] + "号" + sytop_ynhyd[0] + "%、" + sytopnhyd_id[1] + "号" + sytop_ynhyd[1] + "%、" + sytopnhyd_id[2] + "号" + sytop_ynhyd[2] + "%\n" +
-                "月拟合优度末3：" + sybottomnhyd_id[0] + "号" + sybottom_ynhyd[0] + "%、" + sybottomnhyd_id[1] + "号" + sybottom_ynhyd[1] + "%、" + sybottomnhyd_id[2] + "号" + sybottom_ynhyd[2] + "%");
+                "    月拟合优度Top3：" + sytopnhyd_id[0] + "号" + sytop_ynhyd[0] + "%、" + sytopnhyd_id[1] + "号" + sytop_ynhyd[1] + "%、" + sytopnhyd_id[2] + "号" + sytop_ynhyd[2] + "%\n" +
+                "    月拟合优度末3：" + sybottomnhyd_id[0] + "号" + sybottom_ynhyd[0] + "%、" + sybottomnhyd_id[1] + "号" + sybottom_ynhyd[1] + "%、" + sybottomnhyd_id[2] + "号" + sybottom_ynhyd[2] + "%");
 
         String[] glyz_topid = new String[3];
         double[] glyz_top = new double[3];
@@ -530,11 +530,11 @@ public class WindReportService {
         map.put("单机月度分析-分析对象", "分析对象：本月排名top3、末3及上月排名top3、末3风机");
         map.put("单机月度分析-关键数据", "关键数据：\n" +
                 "Top3：" + glyz_topid[0] + "号 机组功率一致性" + glyz_top[0] + "%,设备利用小时：" + lyxs_top[0] + "h\n" +
-                "    " + glyz_topid[1] + "号 机组功率一致性" + glyz_top[1] + "%,设备利用小时：" + lyxs_top[1] + "h\n" +
-                "    " + glyz_topid[2] + "号 机组功率一致性" + glyz_top[2] + "%,设备利用小时：" + lyxs_top[2] + "h\n" +
+                "      " + glyz_topid[1] + "号 机组功率一致性" + glyz_top[1] + "%,设备利用小时：" + lyxs_top[1] + "h\n" +
+                "      " + glyz_topid[2] + "号 机组功率一致性" + glyz_top[2] + "%,设备利用小时：" + lyxs_top[2] + "h\n" +
                 "末3：" + glyz_botid[0] + "号 机组功率一致性" + glyz_bot[0] + "%,设备利用小时：" + lyxs_bot[0] + "h\n" +
-                "    " + glyz_botid[1] + "号 机组功率一致性" + glyz_bot[1] + "%,设备利用小时：" + lyxs_bot[1] + "h\n" +
-                "    " + glyz_botid[2] + "号 机组功率一致性" + glyz_bot[2] + "%,设备利用小时：" + lyxs_bot[2]);
+                "      " + glyz_botid[1] + "号 机组功率一致性" + glyz_bot[1] + "%,设备利用小时：" + lyxs_bot[1] + "h\n" +
+                "      " + glyz_botid[2] + "号 机组功率一致性" + glyz_bot[2] + "%,设备利用小时：" + lyxs_bot[2]);
 
         map.put("单机月度分析-关键数据上月", "关键数据-上月：\n" +
                 "Top3：" + syglyz_topid[0] + "号 机组功率一致性" + syglyz_top[0] + "%,设备利用小时：" + sylyxs_top[0] + "h\n" +
@@ -583,9 +583,9 @@ public class WindReportService {
         String level_Cid = String.join(",", levelStationMap.get("C"));
 
         map.put("性能等级评估", "等级分布：\n" +
-                "A级（优秀）：" + level_A + "台（" + level_Aid + "号等）\n" +
-                "B级（良好）：" + level_B + "台（" + level_Bid + "号等）\n" +
-                "C级（合格）：" + level_C + "台（" + level_Cid + "号等）");
+                "    A级（优秀）：" + level_A + "台（" + level_Aid + "号等）\n" +
+                "    B级（良好）：" + level_B + "台（" + level_Bid + "号等）\n" +
+                "    C级（合格）：" + level_C + "台（" + level_Cid + "号等）");
 
         List<FwjslDTO> fwjslDTOList = fwjsllist.stream().filter(fw -> fw.getWpid().equals("合计")).collect(Collectors.toList());
         List<FwjslDTO> syfwjslDTOList = syfwjsllist.stream().filter(fw -> fw.getWpid().equals("合计")).collect(Collectors.toList());