代码优化

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Comprehensive/ComprehensiveelectricityService.java

@@ -480,9 +480,11 @@ public class ComprehensiveelectricityService {
                         swdltb = tbzbls.get(0).getSwdl().doubleValue();
                         gwdltb = tbzbls.get(0).getGwdl().doubleValue();
                         if (sjdltb != 0) {
-                            zhcydlltb = (sjdltb - swdltb + gwdltb) / sjdltb;
+//                            zhcydlltb = (sjdltb - swdltb + gwdltb) / sjdltb;
+                            zhcydlltb = (zhcydltb / sjdltb) * 100;
                         } else {
-                            zhcydlltb = (sjdltb - swdltb + gwdltb) / 1;
+//                            zhcydlltb = (sjdltb - swdltb + gwdltb) / 1;
+                            zhcydlltb = 0;
                         }
                     }
                     if (!hbzbls.isEmpty() && hbzbls != null) {
@@ -491,9 +493,11 @@ public class ComprehensiveelectricityService {
                         swdlhb = hbzbls.get(0).getSwdl().doubleValue();
                         gwdlhb = hbzbls.get(0).getGwdl().doubleValue();
                         if (sjdlhb != 0) {
-                            zhcydllhb = (sjdlhb - swdlhb + gwdlhb) / sjdlhb;
+//                            zhcydllhb = (sjdlhb - swdlhb + gwdlhb) / sjdlhb;
+                            zhcydllhb = (zhcydlhb / sjdlhb) * 100;
                         } else {
-                            zhcydllhb = (sjdlhb - swdlhb + gwdlhb) / 1;
+//                            zhcydllhb = (sjdlhb - swdlhb + gwdlhb) / 1;
+                            zhcydllhb = 0;
                         }
                     }
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -75,16 +75,15 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
             peeidt.setDaylyxs(NumberUtil.round(day.getLyxs(), 2).doubleValue());
             peeidt.setDaysbklyl(NumberUtil.round(day.getKlyl(), 2).doubleValue());
             peeidt.setDayyxfss(NumberUtil.round(day.getYxfss(), 2).doubleValue());
-            peeidt.setDayjfpl(NumberUtil.round(day.getJfpl(), 2).doubleValue());
+            peeidt.setDayjfpl(NumberUtil.round(day.getJfpl() * 100, 2).doubleValue());
+            peeidt.setDayxfqr(NumberUtil.round(day.getXfqrfs(), 2).doubleValue());
             peeidt.setDayRank(Integer.valueOf(day.getLevel()));
-            peeidt.setDayLevel(level(day.getScore(), i-1));
+            peeidt.setDayLevel(level(day.getScore(), i - 1));
         });
         return peeidtRecords;
     }
 
 
-
-
     private String level(Double score, int i) {
         score = 0 != i ? score / i : 0.0;
         String top;
@@ -115,7 +114,7 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         List<TurbineInfoDay> turbineMonthList = turbineInfoDayService.getTurbineMonthList(windpowerstationId, startDate, endDate);
         List<TurbineInfoDay> collect = turbineMonthList.stream().sorted((t1, t2) -> t2.getScore().compareTo(t1.getScore())).collect(Collectors.toList());
         for (int i = 1; i <= collect.size(); i++) {
-            collect.get(i-1).setLevel(String.valueOf(i));
+            collect.get(i - 1).setLevel(String.valueOf(i));
         }
         if (pageNum == null || pageSize == null || pageNum < 1 || pageSize < 1) {
             return turbineMonthList;