补充提交

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Electricity/Electricityservice.java

@@ -159,7 +159,13 @@ public class Electricityservice {
                             List<ProEconStationPower> dqycls = powerService.getlist(wpls.getId(), firstDayZeroHour);
 
                             if (!dqycls.isEmpty() && dqycls != null) {
-                                dqzqlsum = dqycls.stream().map(ProEconStationPower::getPowerAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+//                                dqzqlsum = dqycls.stream().map(ProEconStationPower::getPowerAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+                                double average = dqycls.stream()
+                                        .mapToDouble(power -> power.getPowerAccuracy().doubleValue())
+                                        .average()
+                                        .orElse(0.0);
+
+                                dqzqlsum = BigDecimal.valueOf(StringUtils.round(average,2));
                                 rfdlyclsum = dqycls.stream().map(ProEconStationPower::getDayPowerForecast).reduce(BigDecimal.ZERO, BigDecimal::add);
                             }
                         }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/analysis/AnalysisNewService.java

@@ -74,13 +74,13 @@ public class AnalysisNewService {
         calendar.add(Calendar.DAY_OF_MONTH, 1);
         Date endDate = calendar.getTime();
 
-        List<ProEconAnalysisSubtableBottom> stringList = new ArrayList<>();
+        List<ProEconAnalysisSubtableBottom> Listbat = new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
 //            if (wp.getId().equals("SXJ_KGDL_XWT_FDC_STA")) continue;
-
-//            补充数据可将其打开
+//
+////            补充数据可将其打开
 //            if (wp.getId().equals("SXJ_KGDL_GJY_FDC_STA")) {
-
+//
 //                for (int g = 0; g <= 56; g++) {
 
             List<ProBasicMeterPoint> meterPoints = proBasicMeterPointService.getBaseMapper().selectList(null);
@@ -116,15 +116,17 @@ public class AnalysisNewService {
                     vo.setStopCodeModify(temp2);
                     vo.setDayValue((temp2 - temp1) * magnification);
                     vo.setDayValueModify((temp2 - temp1) * magnification);
-                    stringList.add(vo);
-                    proEconAnalysisSubtableBottomService.batchAdd(stringList);
+                    Listbat.add(vo);
                 }
+
             }
+                    proEconAnalysisSubtableBottomService.batchAdd(Listbat);
+
 //                    beginDate = DateUtils.addDays(beginDate, -1);
 //                    calendar.add(Calendar.DAY_OF_MONTH, -1);
 //                    endDate = calendar.getTime();
 //                }
-//            // 恢复初始值
+            // 恢复初始值
 //            beginDate = initialFirstDayZeroHour;
 //            }