bug修复

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -1712,10 +1712,8 @@ public class EconomyPointHomePageService {
         pd.setZfdlsj(NumberUtil.round(week, 2).doubleValue());
         String s = year + "-" + month;
         BigDecimal monCache = yfdlCal.get(s);
-//        pd.setYfdlsj(monCache.add(new BigDecimal(rfdl)).doubleValue());
         pd.setYfdlsj(NumberUtil.round(monCache.add(new BigDecimal(rfdl)).doubleValue(), 2).doubleValue());
         BigDecimal yearCache = nfdlCal.get(year);
-//        pd.setNfdlsj(yearCache.add(new BigDecimal(rfdl)).doubleValue());
         pd.setNfdlsj(NumberUtil.round(yearCache.add(new BigDecimal(rfdl)).doubleValue(), 2).doubleValue());
 
         //计划发电量
@@ -1764,9 +1762,9 @@ public class EconomyPointHomePageService {
         ptxdl.setYAxisIndex(0);
         ptssdl.setYAxisIndex(0);
         ptfdl.setYAxisIndex(0);
-        List<ValueVo> vexdl = value(year, 12);
-        List<ValueVo> vessdl = value(year, 12);
-        List<ValueVo> vefdl = value(year, 12);
+        List<ValueVo> vexdl = value(year);
+        List<ValueVo> vessdl = value(year);
+        List<ValueVo> vefdl = value(year);
         for (Integer mon : day1sMap.keySet()) {
             List<TurbineInfoDay> day1s1 = day1sMap.get(mon);
             List<TurbineInfoDay> day1s2 = day1s1.stream().sorted(Comparator.comparing(TurbineInfoDay::getRecordDate).reversed()).collect(Collectors.toList());
@@ -1776,8 +1774,7 @@ public class EconomyPointHomePageService {
             for (ValueVo vv : vexdl) {
                 if (vv.getText().equals(text)) {
                     double bxdl = day1s2.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
-                    String format = String.format("%.2f", bxdl / 1000);
-                    vv.setValue(new BigDecimal(format));
+                    vv.setValue(BigDecimal.valueOf(NumberUtil.round(bxdl / 1000, 2).doubleValue()));
                 }
             }
             for (ValueVo vv : vessdl) {
@@ -1786,15 +1783,13 @@ public class EconomyPointHomePageService {
                     double fjh = day1s2.stream().mapToDouble(TurbineInfoDay::getFjhjxss).sum();
                     double jh = day1s2.stream().mapToDouble(TurbineInfoDay::getJhjxss).sum();
                     double xn = day1s2.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
-                    String format = String.format("%.2f", (xd + fjh + jh + xn) / 1000);
-                    vv.setValue(new BigDecimal(format));
+                    vv.setValue(BigDecimal.valueOf(NumberUtil.round((xd + fjh + jh + xn) / 1000, 2).doubleValue()));
                 }
             }
             for (ValueVo vv : vefdl) {
                 if (vv.getText().equals(text)) {
                     double bfdl = day1s2.stream().mapToDouble(TurbineInfoDay::getRfdl).sum();
-                    String format = String.format("%.2f", bfdl / 1000);
-                    vv.setValue(new BigDecimal(format));
+                    vv.setValue(BigDecimal.valueOf(NumberUtil.round(bfdl / 1000, 2).doubleValue()));
                 }
             }
 
@@ -1816,14 +1811,14 @@ public class EconomyPointHomePageService {
         ptssdl.setYAxisIndex(0);
         ptfdl.setYAxisIndex(0);
         if (lastYear.isEmpty()) {
-            List<ValueVo> value = value(year - 1, month);
+            List<ValueVo> value = value(year - 1);
             ptxdl2.setValue(value);
             ptssdl2.setValue(value);
             ptfdl2.setValue(value);
         } else {
-            List<ValueVo> vxdl2 = value(year - 1, 12);
-            List<ValueVo> vssdl2 = value(year - 1, 12);
-            List<ValueVo> vfdl2 = value(year - 1, 12);
+            List<ValueVo> vxdl2 = value(year - 1);
+            List<ValueVo> vssdl2 = value(year - 1);
+            List<ValueVo> vfdl2 = value(year - 1);
             Map<Integer, List<TurbineInfoDay>> day1sMap2 = lastYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
             for (Integer mon2 : day1sMap2.keySet()) {
                 List<TurbineInfoDay> day1s3 = day1sMap2.get(mon2);
@@ -1834,8 +1829,7 @@ public class EconomyPointHomePageService {
                 for (ValueVo vv : vxdl2) {
                     if (vv.getText().equals(text)) {
                         double bxdl2 = day1s4.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
-                        String format = String.format("%.2f", bxdl2 / 1000);
-                        vv.setValue(new BigDecimal(format));
+                        vv.setValue(BigDecimal.valueOf(NumberUtil.round(bxdl2 / 1000, 2).doubleValue()));
                     }
                 }
                 for (ValueVo vv : vssdl2) {
@@ -1844,15 +1838,13 @@ public class EconomyPointHomePageService {
                         double fjh = day1s4.stream().mapToDouble(TurbineInfoDay::getFjhjxss).sum();
                         double jh = day1s4.stream().mapToDouble(TurbineInfoDay::getJhjxss).sum();
                         double xn = day1s4.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
-                        String format = String.format("%.2f", (xd + fjh + jh + xn) / 1000);
-                        vv.setValue(new BigDecimal(format));
+                        vv.setValue(BigDecimal.valueOf(NumberUtil.round((xd + fjh + jh + xn) / 1000, 2).doubleValue()));
                     }
                 }
                 for (ValueVo vv : vfdl2) {
                     if (vv.getText().equals(text)) {
-                        double bfl2 = day1s4.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
-                        String format = String.format("%.2f", bfl2 / 1000);
-                        vv.setValue(new BigDecimal(format));
+                        double bfl2 = day1s4.stream().mapToDouble(TurbineInfoDay::getRfdl).sum();
+                        vv.setValue(BigDecimal.valueOf(NumberUtil.round(bfl2 / 1000, 2).doubleValue()));
                     }
                 }
             }
@@ -1886,9 +1878,9 @@ public class EconomyPointHomePageService {
     }
 
 
-    private List<ValueVo> value(int year, int month) {
+    private List<ValueVo> value(int year) {
         List<ValueVo> lv = new ArrayList<>();
-        for (int i = 1; i <= month; i++) {
+        for (int i = 1; i <= 12; i++) {
             ValueVo vo = new ValueVo();
             vo.setText(year + "-" + i);
             vo.setValue(new BigDecimal(0));
@@ -2069,7 +2061,7 @@ public class EconomyPointHomePageService {
             nfdlLastCal.put(intYear - 1, nfdlc);
         } else {
             Double nfdlc = calDivide(lastYearData.get(0).getRfdl(), 1000.0);
-            nfdlLastCal.put(intYear - 1, nfdlc);
+            nfdlLastCal.put(intYear - 1, NumberUtil.round(nfdlc, 2).doubleValue());
         }
         currentqw.clear();
 
@@ -2100,11 +2092,11 @@ public class EconomyPointHomePageService {
         Long e = d.getTime() / 1000;
         List<PointData> yjhpd = edosUtil.getHistoryDatasRaw("区域集控.惠安风场.统计计算.月计划输入值", s, e);
         if (null != yjhpd && !yjhpd.isEmpty()) {
-            yjh = yjhpd.get(0).getPointValueInDouble();
+            yjh = yjhpd.get(yjhpd.size() - 1).getPointValueInDouble();
         }
         List<PointData> njhpd = edosUtil.getHistoryDatasRaw("区域集控.惠安风场.统计计算.年计划输入值", s, e);
         if (null != njhpd && !njhpd.isEmpty()) {
-            njh = njhpd.get(0).getPointValueInDouble();
+            njh = njhpd.get(njhpd.size() - 1).getPointValueInDouble();
         }
         lastCalDate = LocalDate.now();
     }