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

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
  * @date 2024/11/27 15:17
  */
 @XService
-public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseService implements ISpaceYesterdayGreenRateCloudService {
+public class SpaceYesterdayGreenRateCloudServiceImpl implements ISpaceYesterdayGreenRateCloudService {
 
     /**
      * 昨日绿电占比
@@ -149,14 +149,18 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                     closeWellTime = this.parseDateTime(unOptimizeDuration.getCloseWellTime());
                     if (DateUtil.compare(dateTime, openWellTime) >= 0 && DateUtil.compare(dateTime, closeWellTime) < 0) {
                         //计算发电功率
-                        if (activePower.compareTo(BigDecimal.ZERO) == 0) {
+                        if (activePower.compareTo(BigDecimal.ZERO) <= 0) {
                             //不管
                         } else if (activePower.compareTo(sumServiceRating) >= 0) {
                             //光伏发电功率大于运行负荷: 该时段光伏用电量量=运行负荷*0.5
                             wellGreenPowerActual = wellGreenPowerActual.add(serviceRating.multiply(BusinessConstant.BIG_DECIMAL_0_5));
                         } else {
-                            //光伏发电功率小于井的运行负荷: 该时段光伏用电量=光伏发电功率*0.5
-                            wellGreenPowerActual = wellGreenPowerActual.add(activePower.multiply(BusinessConstant.BIG_DECIMAL_0_5));
+                            //光伏发电功率-井口累计发电功率 : 小于等于0不管
+                            BigDecimal subtract = activePower.subtract(sumServiceRating).add(serviceRating);
+                            if (subtract.compareTo(BigDecimal.ZERO) > 0) {
+                                //光伏发电功率小于井的运行负荷: 该时段光伏用电量=(光伏发电功率-井口累计发电功率+当前井口运行功率)*0.5
+                                wellGreenPowerActual = wellGreenPowerActual.add(subtract.multiply(BusinessConstant.BIG_DECIMAL_0_5));
+                            }
                         }
                         //累加开井时长
                         runHourActual = runHourActual.add(BusinessConstant.BIG_DECIMAL_0_5);
@@ -175,14 +179,18 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                         closeWellTime = this.parseDateTime(optimizeDuration.getCloseWellTime());
                         if (DateUtil.compare(dateTime, openWellTime) >= 0 && DateUtil.compare(dateTime, closeWellTime) < 0) {
                             //计算发电功率
-                            if (predictionPower.compareTo(BigDecimal.ZERO) == 0) {
+                            if (predictionPower.compareTo(BigDecimal.ZERO) <= 0) {
                                 //不管
                             } else if (predictionPower.compareTo(sumServiceRating) >= 0) {
                                 //光伏发电功率大于运行负荷: 该时段光伏用电量量=运行负荷*0.5
                                 wellGreenPowerOptimize = wellGreenPowerOptimize.add(serviceRating.multiply(BusinessConstant.BIG_DECIMAL_0_5));
                             } else {
-                                //光伏发电功率小于井的运行负荷: 该时段光伏用电量=光伏发电功率*0.5
-                                wellGreenPowerOptimize = wellGreenPowerOptimize.add(predictionPower.multiply(BusinessConstant.BIG_DECIMAL_0_5));
+                                //光伏发电功率-井口累计发电功率 : 小于等于0不管
+                                BigDecimal subtract = predictionPower.subtract(sumServiceRating).add(serviceRating);
+                                if (subtract.compareTo(BigDecimal.ZERO) > 0) {
+                                    //光伏发电功率小于井的运行负荷: 该时段光伏用电量=(光伏发电功率-井口累计发电功率+当前井口运行功率)*0.5
+                                    wellGreenPowerOptimize = wellGreenPowerOptimize.add(subtract.multiply(BusinessConstant.BIG_DECIMAL_0_5));
+                                }
                             }
                             //累加开井时长
                             runHourOptimize = runHourOptimize.add(BusinessConstant.BIG_DECIMAL_0_5);