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

@@ -168,6 +168,7 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                             wellGreenPowerActual = wellGreenPowerActual.add(serviceRating.multiply(BusinessConstant.BIG_DECIMAL_0_5));
                             activeWeightMap.get(dateTime).setPower(activePower.subtract(serviceRating));
                         } else {
+                            greenFlag = true;
                             //光伏发电功率-井口累计发电功率 : 小于等于0不管
                             BigDecimal subtract = activePower.subtract(serviceRating);
                             if (subtract.compareTo(BigDecimal.ZERO) > 0) {
@@ -178,11 +179,8 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                         }
                         //累加开井时长
                         runHourActual = runHourActual.add(BusinessConstant.BIG_DECIMAL_0_5);
-                        //计算电费
-                        if (greenFlag) {
-                            //绿电电费
-                            powerCostActual = powerCostActual.add(BusinessConstant.BIG_DECIMAL_0_3587.multiply(BusinessConstant.BIG_DECIMAL_0_5));
-                        } else {
+                        //计算电费(绿电没电费)
+                        if (!greenFlag) {
                             //市电峰谷电费
                             powerCostActual = powerCostActual.add(optimizeWeight.getElectricityPrice().multiply(BusinessConstant.BIG_DECIMAL_0_5));
                         }
@@ -211,6 +209,7 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                                 wellGreenPowerOptimize = wellGreenPowerOptimize.add(serviceRating.multiply(BusinessConstant.BIG_DECIMAL_0_5));
                                 predictionWeightMap.get(dateTime).setPower(predictionPower.subtract(serviceRating));
                             } else {
+                                greenFlag = true;
                                 //光伏发电功率-井口累计发电功率 : 小于等于0不管
                                 BigDecimal subtract = predictionPower.subtract(serviceRating);
                                 if (subtract.compareTo(BigDecimal.ZERO) > 0) {
@@ -221,11 +220,8 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                             }
                             //累加开井时长
                             runHourOptimize = runHourOptimize.add(BusinessConstant.BIG_DECIMAL_0_5);
-                            //计算电费
-                            if (greenFlag) {
-                                //绿电电费
-                                powerCostOptimize = powerCostOptimize.add(BusinessConstant.BIG_DECIMAL_0_3587.multiply(BusinessConstant.BIG_DECIMAL_0_5));
-                            } else {
+                            //计算电费(绿电没电费)
+                            if (!greenFlag) {
                                 //市电峰谷电费
                                 powerCostOptimize = powerCostOptimize.add(optimizeWeight.getElectricityPrice().multiply(BusinessConstant.BIG_DECIMAL_0_5));
                             }