报告中一些bug修复

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

@@ -129,11 +129,11 @@ public class GetWindReportService {
 
             for (int i = 0; i < linedlList.size(); i++) {
                 var item = linedlList.get(i);
-                lnfdl[i] = StringUtils.round(item.getRfdl() / bl, 2);
-                lnllfdl[i] = StringUtils.round(item.getLlfdl() / bl, 2);
-                lnzssdl[i] = StringUtils.round(item.getGzss() / bl, 2);
-                lnfnlyl[i] = StringUtils.round(item.getFnlyl(), 2);
-                lnxdssdl[i] = StringUtils.round(item.getXdss() / bl, 2);
+                lnfdl[i] = item.getRfdl() / bl;
+                lnllfdl[i] = item.getLlfdl() / bl;
+                lnzssdl[i] = item.getGzss() / bl;
+                lnfnlyl[i] = item.getFnlyl();
+                lnxdssdl[i] = item.getXdss() / bl;
             }
         }
         double p1fdl = StringUtils.round(lnfdl[0] + lnfdl[1], 2);
@@ -142,8 +142,8 @@ public class GetWindReportService {
         double p2llfdl = StringUtils.round(lnllfdl[2] + lnllfdl[3], 2);
         double p1ssdl = StringUtils.round(lnzssdl[0] + lnzssdl[1], 2);
         double p2ssdl = StringUtils.round(lnzssdl[2] + lnzssdl[3], 2);
-        double p1fnlyl = StringUtils.round((lnfnlyl[0] + lnfnlyl[1]) / 2, 2);
-        double p2fnlyl = StringUtils.round((lnfnlyl[2] + lnfnlyl[3]) / 2, 2);
+        double p1fnlyl = StringUtils.round((p1fdl / p1llfdl) * 100, 2);
+        double p2fnlyl = StringUtils.round((p2fdl / p2llfdl) * 100, 2);
         double p1qfl = StringUtils.round((lnxdssdl[0] + lnxdssdl[1]) / p1llfdl, 2);
         double p2qfl = StringUtils.round((lnxdssdl[2] + lnxdssdl[3]) / p2llfdl, 2);
 
@@ -280,7 +280,7 @@ 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] + "号" + topIds[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" +
@@ -329,9 +329,9 @@ public class GetWindReportService {
         benchmark benchmark3 = new benchmark();
         benchmark3.setTargets("对标线路：惠安一号集电线路、惠安二号集电线路、惠安三号集电线路、惠安四号集电线路");
         benchmark3.setIndicator("对标指标：\n" +
-                "          线路总发电量：惠安一号集电线路" + lnfdl[0] + "万kWh、惠安二号集电线路" + lnfdl[1] + "万kWh、惠安三号集电线路" + lnfdl[2] + "万kWh、惠安四号集电线路" + lnfdl[3] + "万kWh\n" +
-                "          线路总损失电量：惠安一号集电线路" + lnzssdl[0] + "万kWh、惠安二号集电线路" + lnzssdl[1] + "万kWh、惠安三号集电线路" + lnzssdl[2] + "万kWh、惠安四号集电线路" + lnzssdl[3] + "万kWh\n" +
-                "          线路风能利用率：惠安一号集电线路" + lnfnlyl[0] + "%、惠安二号集电线路" + lnfnlyl[1] + "%、惠安三号集电线路" + lnfnlyl[2] + "%、惠安四号集电线路" + lnfnlyl[3] + "%\n" +
+                "          线路总发电量：惠安一号集电线路" + StringUtils.round(lnfdl[0] ,2)+ "万kWh、惠安二号集电线路" + StringUtils.round(lnfdl[1],2) + "万kWh、惠安三号集电线路" + StringUtils.round(lnfdl[2],2) + "万kWh、惠安四号集电线路" + StringUtils.round(lnfdl[3],2) + "万kWh\n" +
+                "          线路总损失电量：惠安一号集电线路" + StringUtils.round(lnzssdl[0],2) + "万kWh、惠安二号集电线路" + StringUtils.round(lnzssdl[1],2) + "万kWh、惠安三号集电线路" + StringUtils.round(lnzssdl[2],2) + "万kWh、惠安四号集电线路" + StringUtils.round(lnzssdl[3],2) + "万kWh\n" +
+                "          线路风能利用率：惠安一号集电线路" + StringUtils.round(lnfnlyl[0],2) + "%、惠安二号集电线路" + StringUtils.round(lnfnlyl[1],2) + "%、惠安三号集电线路" + StringUtils.round(lnfnlyl[2],2) + "%、惠安四号集电线路" + StringUtils.round(lnfnlyl[3],2) + "%\n" +
                 "          线路弃风率：惠安一号集电线路" + StringUtils.round(lnxdssdl[0] / lnllfdl[0] * 100, 2) + "%、" +
                 "          惠安二号集电线路" + StringUtils.round(lnxdssdl[1] / lnllfdl[1] * 100, 2) + "%、" +
                 "          惠安三号集电线路" + StringUtils.round(lnxdssdl[2] / lnllfdl[2] * 100, 2) + "%、" +

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

@@ -403,7 +403,7 @@ public class WindReportService {
             yqrfs[i] = StringUtils.round(item.getMonthInputSmall(), 2);
             yqcfs[i] = StringUtils.round(item.getMonthOutputSmall(), 2);
         }
-        map.put("单台风速分析", "单台风速分析（排名前三）：\n" +
+        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");
@@ -527,21 +527,22 @@ public class WindReportService {
 
         }
 
-        map.put("单机月度分析-分析对象", "" + glyz_topid[0] + "、" + glyz_topid[1] + "、" + glyz_topid[2] + "、" + glyz_topid[0] + "、" + glyz_topid[1] + "、" + glyz_topid[2] + "、号风机");
+        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" +
-                "" + syglyz_topid[1] + "号 机组功率一致性" + syglyz_top[1] + "%,设备利用小时：" + sylyxs_top[1] + "h\n" +
-                "" + syglyz_topid[2] + "号 机组功率一致性" + syglyz_top[2] + "%,设备利用小时：" + sylyxs_top[2] + "h\n" +
+                "    " + syglyz_topid[1] + "号 机组功率一致性" + syglyz_top[1] + "%,设备利用小时：" + sylyxs_top[1] + "h\n" +
+                "    " + syglyz_topid[2] + "号 机组功率一致性" + syglyz_top[2] + "%,设备利用小时：" + sylyxs_top[2] + "h\n" +
                 "末3：" + syglyz_botid[0] + "号 机组功率一致性" + syglyz_bot[0] + "%,设备利用小时：" + sylyxs_bot[0] + "h\n" +
-                "" + syglyz_botid[1] + "号 机组功率一致性" + syglyz_bot[1] + "%,设备利用小时：" + sylyxs_bot[1] + "h\n" +
-                "" + syglyz_botid[2] + "号 机组功率一致性" + syglyz_bot[2] + "%,设备利用小时：" + sylyxs_bot[2]);
+                "    " + syglyz_botid[1] + "号 机组功率一致性" + syglyz_bot[1] + "%,设备利用小时：" + sylyxs_bot[1] + "h\n" +
+                "    " + syglyz_botid[2] + "号 机组功率一致性" + syglyz_bot[2] + "%,设备利用小时：" + sylyxs_bot[2]);
 
 
         // 初始化统计Map