报告中一些bug修复

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

@@ -280,16 +280,16 @@ 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] + "号" + 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" +
-                "          弃风率：" + topIds[0] + "号" + StringUtils.round(topXdssdl[0] / topLlfdl[0] * 100, 2) + "%、" + topIds[1] + "号" + StringUtils.round(topXdssdl[1] / topLlfdl[1] * 100, 2) + "%、" + topIds[2] + "号" + StringUtils.round(topXdssdl[2] / topLlfdl[2] * 100, 2) + "%");
+                "    单台发电量：" + 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" +
+                "    弃风率：" + topIds[0] + "号" + StringUtils.round(topXdssdl[0] / topLlfdl[0] * 100, 2) + "%、" + topIds[1] + "号" + StringUtils.round(topXdssdl[1] / topLlfdl[1] * 100, 2) + "%、" + topIds[2] + "号" + StringUtils.round(topXdssdl[2] / topLlfdl[2] * 100, 2) + "%");
 
         benchmark1.setConclusion("对标结论：" + topIds[2] + "号与" + topIds[0] + "号风机核心差异，损失电量差" + StringUtils.round(top1ssdl - top3ssdl, 2) + "万kWh");
         map.put("cndb", benchmark1);
@@ -301,10 +301,10 @@ public class GetWindReportService {
         benchmark benchmark2 = new benchmark();
         benchmark2.setTargets("对标项目：惠安一期项目、惠安二期项目");
         benchmark2.setIndicator("对标指标：\n" +
-                "          项目总发电量：惠安一期项目" + p1fdl + "万kWh、惠安二期项目" + p2fdl + "万kWh\n" +
-                "          项目总损失电量：惠安一期项目" + p1ssdl + "万kWh、惠安二期项目" + p2ssdl + "万kWh\n" +
-                "          项目风能利用率：惠安一期项目" + p1fnlyl + "%、惠安二期项目" + p2fnlyl + "%\n" +
-                "          项目弃风率：惠安一期项目" + p1qfl + "%、惠安二期项目" + p2qfl + "%");
+                "    项目总发电量：惠安一期项目" + p1fdl + "万kWh、惠安二期项目" + p2fdl + "万kWh\n" +
+                "    项目总损失电量：惠安一期项目" + p1ssdl + "万kWh、惠安二期项目" + p2ssdl + "万kWh\n" +
+                "    项目风能利用率：惠安一期项目" + p1fnlyl + "%、惠安二期项目" + p2fnlyl + "%\n" +
+                "    项目弃风率：惠安一期项目" + p1qfl + "%、惠安二期项目" + p2qfl + "%");
         benchmark2.setConclusion("对标结论：" + pfdlmax + "在发电量指标上优于" + pfdlmin + "，惠安一期项目与惠安二期项目损失电量差距为" + StringUtils.round(p1ssdl - p2ssdl, 2));
         map.put("xmdb", benchmark2);
 
@@ -329,13 +329,13 @@ public class GetWindReportService {
         benchmark benchmark3 = new benchmark();
         benchmark3.setTargets("对标线路：惠安一号集电线路、惠安二号集电线路、惠安三号集电线路、惠安四号集电线路");
         benchmark3.setIndicator("对标指标：\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) + "%、" +
-                "          惠安四号集电线路" + StringUtils.round(lnxdssdl[3] / lnllfdl[3] * 100, 2) + "%");
+                "    线路总发电量：惠安一号集电线路" + 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) + "%、" +
+                "    惠安四号集电线路" + StringUtils.round(lnxdssdl[3] / lnllfdl[3] * 100, 2) + "%");
         benchmark3.setConclusion("对标结论：" + lnfdlmax + "在发电量指标上优于" + lnfdlmin + "，损失电量差距为" + StringUtils.round(ssdlmaxValue - ssdlminValue, 2));
 
         map.put("xldb", benchmark3);

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

@@ -538,11 +538,11 @@ public class WindReportService {
 
         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