报告调整

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

@@ -333,9 +333,9 @@ public class GetWindReportService {
                 "    线路总损失电量：惠安一号集电线路" + 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(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);
@@ -479,14 +479,6 @@ public class GetWindReportService {
         double ydfnlyl = monthList.size() > 0 ? monthList.get(0).getFnlyl() : 0;
         double ndfnlyl = yearList.size() > 0 ? yearList.get(0).getFnlyl() : 0;
 
-//        map.put("风能利用率","场站整体风能利用率：月度"+StringUtils.round(ydfnlyl, 0)+"%，年度"+StringUtils.round(ndfnlyl, 0)+"%\n" +
-//                "风能利用率Top3风机："+fntop3list.get(0).getStationId()+"号"+StringUtils.round(fntop3list.get(0).getFnlyl(),0)+"%、"
-//                +fntop3list.get(1).getStationId()+"号"+StringUtils.round(fntop3list.get(1).getFnlyl(),0)+"%、" +
-//                ""+fntop3list.get(1).getStationId()+"号"+StringUtils.round(fntop3list.get(2).getFnlyl(),0)+"%\n" +
-//                "风能利用率末3风机："+fnbottom3list.get(0).getStationId()+"号"+StringUtils.round(fnbottom3list.get(0).getFnlyl(),0)+"%、" +
-//                ""+fnbottom3list.get(1).getStationId()+"号"+StringUtils.round(fnbottom3list.get(1).getFnlyl(),0)+"%、" +
-//                "" +fnbottom3list.get(2).getStationId()+"号"+StringUtils.round(fnbottom3list.get(2).getFnlyl(),0)+"%");
-
 
         map.put("风能利用率", "场站整体风能利用率：月度" + StringUtils.round(ydfnlyl, 2) + "%，年度" + StringUtils.round(ndfnlyl, 2) + "%");
         map.put("风能利用率Top3风机","风能利用率Top3风机：" + fntop3list.get(0).getStationId() + "号" + StringUtils.round(fntop3list.get(0).getFnlyl(), 2) + "%、"

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

@@ -259,12 +259,6 @@ 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" +
-//                "同比/环比分析：月度发电量同比" + monthfdltb + "%（±），环比" + monthfdlhb + "%（±）");
 
         map.put("发电量分析-总发电量", "场站总发电量：月度" + monthfdl + "万kWh，年度" + yearfdl + "万kWh");
         map.put("发电量分析-理论发电量","理论发电量：月度" + monthllfdl + "万kWh，年度" + yearllfdl + "万kWh");
@@ -300,11 +294,6 @@ public class WindReportService {
         double monthcydlltb = qnmonthcydll > 1 ? StringUtils.round((monthcydll - qnmonthcydll) / qnmonthcydll * 100, 2) : 0.0;
 
 
-//        map.put("综合场用电量分析", "月度场用电量：" + monthcydl + "万kWh\n" +
-//                "年度场用电量：" + yearcydl + "万kWh\n" +
-//                "场用电率：月度" + monthcydll + "%，年度" + yearcydll + "%\n" +
-//                "与同期对比：月度场用电量同比" + monthcydltb + "%（±），场用电率同比" + monthcydlltb + "%（±）");
-
         map.put("综合场用电量分析-月度场用电量","月度场用电量：" + monthcydl + "万kWh");
         map.put("综合场用电量分析-年度场用电量","年度场用电量：" + yearcydl + "万kWh");
         map.put("综合场用电量分析-场用电率","场用电率：月度" + monthcydll + "%，年度" + yearcydll + "%");
@@ -349,11 +338,6 @@ public class WindReportService {
                 .orElse(0.0);
         double tqb_jfpl = qnavgjfpl > 1 ? StringUtils.round((avgjfpl - qnavgjfpl) / qnavgjfpl * 100, 2) : 0.0;
 
-//        map.put("风资源分析", "风资源数据：\n" +
-//                "平均风速：" + avgfs + "m/s\n" +
-//                "主导风向：" + avgfx + "\n" +
-//                "静风频率：" + avgjfpl + "%\n" +
-//                "历史对比：与去年同期相比，平均风速" + tqb_avgfs + "m/s（±），静风频率" + tqb_jfpl + "%（±）");
 
         map.put("风资源分析-风资源数据","风资源数据：\n" +
                         "    平均风速：" + avgfs + "m/s\n" +
@@ -468,12 +452,6 @@ public class WindReportService {
             sybottomnhyd_id[i] = qnitem_bot.getWindturbineId() != null ? qnitem_bot.getWindturbineId() : "";
             sybottom_ynhyd[i] = StringUtils.round(qnitem_bot.getMonthGoodness(), 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] + "%\n" +
-//                "拟合优度排行—上月同期：\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] + "%");
 
         map.put("拟合优度排行","拟合优度排行：\n" +
                 "    月拟合优度Top3：" + topnhyd_id[0] + "号" + top_ynhyd[0] + "%、" + topnhyd_id[1] + "号" + top_ynhyd[1] + "%、" + topnhyd_id[2] + "号" + top_ynhyd[2] + "%\n" +
@@ -713,13 +691,6 @@ public class WindReportService {
         }
 
         double ztzhl_hb = StringUtils.round((wfzzhl-sy_ztzhl) / sy_ztzhl * 100,2);
-//        map.put("状态转换率", "大于3米风速转换次数及转换率：\n" +
-//                "5分钟：转换次数为"+wfzcs+"次，转换率为"+wfzzhl+"%\n" +
-//                "10分钟：转换次数为"+sfzcs+"次，转换率为"+sfzzhl+"%\n" +
-//                "15分钟：转换次数为"+swfzcs+"次，转换率为"+swfzzhl+"%\n" +
-//                "20分钟：转换次数为"+esfzcs+"次，转换率为"+esfzzhl+"%\n" +
-//                "月度5分钟转换次数排名最低的三台风机："+ztzhbot_id[0]+"号（"+ztzhbot_cs[0]+"次）、"+ztzhbot_id[1]+"号（"+ztzhbot_cs[1]+"次）、"+ztzhbot_id[2]+"号（"+ztzhbot_cs[2]+"次）\n" +
-//                "与上月对比：月度5分钟转换率环比"+ztzhl_hb+"%（±）");
 
         map.put("状态转换率-大于3米风速","大于3米风速转换次数及转换率：\n" +
                 "    5分钟：转换次数为"+wfzcs+"次，转换率为"+wfzzhl+"%\n" +