feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceYesterdayGreenRateCloudServiceImpl.java

@@ -13,7 +13,9 @@ import pps.cloud.prediction.service.data.third_active_power.GetThirdActivePowerI
 import pps.cloud.prediction.service.data.third_active_power.GetThirdActivePowerOutput;
 import pps.cloud.space.service.ISpaceYesterdayGreenRateCloudService;
 import pps.core.common.constant.BusinessConstant;
+import pps.core.common.utils.BaseUtils;
 import pps.core.space.entity.SpaceOptimizeShortDurationView;
+import pps.core.space.entity.SpaceYesterdayGreenRateView;
 import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
 import xstartup.annotation.XService;
 import xstartup.base.XContext;
@@ -102,6 +104,9 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
         List<SpaceOptimizeShortDurationView> unOptimizeList;
         List<SpaceOptimizeShortDurationView> optimizeList;
         TreeMap<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>> wellSortMap;
+        SpaceOptimizeShortDurationView durationTemp;
+        BigDecimal serviceRating;
+        List<SpaceYesterdayGreenRateView> batchList = new ArrayList<>(durationCollect.size() * 2);
         for (Map.Entry<String, Map<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>>> lineEntry : durationCollect.entrySet()) {
             lineName = lineEntry.getKey();
             if (activeMap.containsKey(lineName)) {
@@ -116,17 +121,23 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
             }
             //按顺序排
             wellSortMap = new TreeMap<>(lineEntry.getValue());
-            BigDecimal serviceRating = BigDecimal.ZERO;
+            serviceRating = BigDecimal.ZERO;
+            //计算结果
             for (Map.Entry<Integer, Map<Integer, List<SpaceOptimizeShortDurationView>>> sortEntry : wellSortMap.entrySet()) {
                 //未优化间开
                 unOptimizeList = sortEntry.getValue().get(1);
                 if (CollUtil.isEmpty(unOptimizeList)) {
                     continue;
                 }
+                BigDecimal wellTotalPowerActual = BigDecimal.ZERO;
+                BigDecimal wellTotalPowerOptimize = BigDecimal.ZERO;
+                BigDecimal wellGreenPowerActual = BigDecimal.ZERO;
+                BigDecimal wellGreenPowerOptimize = BigDecimal.ZERO;
+                durationTemp = unOptimizeList.get(0);
+                //累加运行功率
+                serviceRating = serviceRating.add(ObjectUtil.defaultIfNull(durationTemp.getServiceRating(), BigDecimal.ZERO));
                 //优化后间开
                 optimizeList = sortEntry.getValue().get(0);
-                //累加运行功率
-                serviceRating = serviceRating.add(ObjectUtil.defaultIfNull(unOptimizeList.get(0).getServiceRating(), BigDecimal.ZERO));
                 //计算优化前后功率
                 for (DateTime dateTime : rangeToList) {
                     BigDecimal activePower;
@@ -137,9 +148,26 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                     if (predictionPowerMap.containsKey(dateTime)) {
                         predictionPower = predictionPowerMap.get(dateTime);
                     }
+
+
                 }
+                //添加计算结果
+                SpaceYesterdayGreenRateView yesterdayGreenRateView = new SpaceYesterdayGreenRateView();
+                BaseUtils.setBaseModelDefaultForJob(yesterdayGreenRateView);
+                yesterdayGreenRateView.setRecordDate(beginOfYesterday);
+                yesterdayGreenRateView.setWellheadId(durationTemp.getWellheadId());
+                yesterdayGreenRateView.setWellNumber(durationTemp.getWellNumber());
+                yesterdayGreenRateView.setStartSeq(sortEntry.getKey());
+                yesterdayGreenRateView.setWellTotalPowerActual(wellTotalPowerActual);
+                yesterdayGreenRateView.setWellTotalPowerOptimize(wellTotalPowerOptimize);
+                yesterdayGreenRateView.setWellGreenPowerActual(wellGreenPowerActual);
+                yesterdayGreenRateView.setWellGreenPowerOptimize(wellGreenPowerOptimize);
+                yesterdayGreenRateView.setGreenPowerRateActual(BaseUtils.getRate(wellGreenPowerActual, wellTotalPowerActual));
+                yesterdayGreenRateView.setGreenPowerRateOptimize(BaseUtils.getRate(wellGreenPowerOptimize, wellTotalPowerOptimize));
+                batchList.add(yesterdayGreenRateView);
             }
         }
+        System.out.println();
         return XServiceResult.OK;
     }
 }
\ No newline at end of file