Просмотр исходного кода

经济运行报告返回文字修改

王波 2 месяцев назад
Родитель
Сommit
63093a1feb

+ 6 - 6
runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/NewGetWindReportService.java

@@ -549,13 +549,13 @@ public class NewGetWindReportService {
 
 
         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) + "%、"
-                + fntop3list.get(1).getStationId() + "号" + StringUtils.round(fntop3list.get(1).getFnlyl(), 2) + "%、" +
-                "" + fntop3list.get(1).getStationId() + "号" + StringUtils.round(fntop3list.get(2).getFnlyl(), 2) + "%");
+        map.put("风能利用率Top3风机","风能利用率Top3风机:" + fntop3list.get(0).getStationId() + "号风机" + StringUtils.round(fntop3list.get(0).getFnlyl(), 2) + "%、"
+                + fntop3list.get(1).getStationId() + "号风机" + StringUtils.round(fntop3list.get(1).getFnlyl(), 2) + "%、" +
+                "" + fntop3list.get(1).getStationId() + "号风机" + StringUtils.round(fntop3list.get(2).getFnlyl(), 2) + "%");
 
-        map.put("风能利用率末3风机","风能利用率末3风机:" + fnbottom3list.get(0).getStationId() + "号" + StringUtils.round(fnbottom3list.get(0).getFnlyl(), 2) + "%、" +
-                "" + fnbottom3list.get(1).getStationId() + "号" + StringUtils.round(fnbottom3list.get(1).getFnlyl(), 2) + "%、" +
-                "" + fnbottom3list.get(2).getStationId() + "号" + StringUtils.round(fnbottom3list.get(2).getFnlyl(), 2) + "%");
+        map.put("风能利用率末3风机","风能利用率末3风机:" + fnbottom3list.get(0).getStationId() + "号风机" + StringUtils.round(fnbottom3list.get(0).getFnlyl(), 2) + "%、" +
+                "" + fnbottom3list.get(1).getStationId() + "号风机" + StringUtils.round(fnbottom3list.get(1).getFnlyl(), 2) + "%、" +
+                "" + fnbottom3list.get(2).getStationId() + "号风机" + StringUtils.round(fnbottom3list.get(2).getFnlyl(), 2) + "%");
 
         double byllfdl = StringUtils.round(monthList.size() > 0 ? monthList.get(0).getLlfdl() / bl : 0, 2);
 

+ 2 - 2
runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/NewWindReportService.java

@@ -200,8 +200,8 @@ public class NewWindReportService {
             mttrtq = StringUtils.round((monthdmttr - qnmonthmttr) / qnmonthmttr * 100, 2);
         }
 
-        map.put("MTBF", "MTBF(平均无故障时间):月度" + monthdmtbf + "h,与上年同期对比±" + mtbftq + "%");
-        map.put("MTTR", "MTTR(平均修复时间):月度" + monthdmttr + "h,与上年同期对比±" + mttrtq + "%");
+        map.put("MTBF", "MTBF(场站平均无故障时间):月度" + monthdmtbf + "h,与上年同期对比±" + mtbftq + "%");
+        map.put("MTTR", "MTTR(场站平均修复时间):月度" + monthdmttr + "h,与上年同期对比±" + mttrtq + "%");
 
         // =============================================================
         // 4. 填充 "风机可利用率" (fanAvailability) 数据