feat(吉林演示): 松原

1.排查并修复各时段间开优化功能执行异常导致未执行间开优化问题;
2.排查并修复15天间开优化功能执行后,优化结果时间段展示错乱问题;
3.排查并修复光伏功率预测展示功能,实际功率未展示问题;
4.排查并修复天气数据获取服务,数据处理后入库缺少数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java

@@ -627,7 +627,7 @@ public class HomePageService {
                     carbonReduction = ServiceUtil.calculateCarbonReduction(analysisEnt.getPhotovoltaicPower());
                     //经济效益(万元):光伏累计发电*0.65-光伏累计发电*0.28
                     economicBenefit = analysisEnt.getPhotovoltaicPower()
-                            .multiply(BigDecimal.valueOf(0.65))
+                            .multiply(BigDecimal.valueOf(0.6669))
                             .subtract(analysisEnt.getPhotovoltaicPower()
                                     .multiply(BigDecimal.valueOf(0.28)))
                             .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
@@ -667,12 +667,8 @@ public class HomePageService {
                     greenElectricityRate = BaseUtils.getRate(powerGeneration, dailyElectricityConsumption).toString();
                     //累计减碳量
                     carbonReduction = ServiceUtil.calculateCarbonReduction(dailyEnt.getPhotovoltaicPower());
-                    //经济效益(万元):光伏累计发电*0.65-光伏累计发电*0.28
-                    economicBenefit = dailyEnt.getPhotovoltaicPower()
-                            .multiply(BigDecimal.valueOf(0.65))
-                            .subtract(dailyEnt.getPhotovoltaicPower()
-                                    .multiply(BigDecimal.valueOf(0.28)))
-                            .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
+                    //经济效益(万元)
+                    economicBenefit = ServiceUtil.getEconomicBenefit(dailyEnt.getPhotovoltaicPower(), oilFieldCode);
                     //累计电费
                     accumulatedCharge = dailyEnt.getElectricityChargeCity()
                             .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/utils/ServiceUtil.java

@@ -425,6 +425,40 @@ public class ServiceUtil {
         return result.getResult();
     }
 
+    /**
+     * 获得经济效益
+     *
+     * @param photovoltaicPower 光伏发电
+     * @param oilFieldCode      油田代码
+     * @return {@link BigDecimal }
+     */
+    public static BigDecimal getEconomicBenefit(BigDecimal photovoltaicPower, String oilFieldCode) {
+        //经济效益
+        BigDecimal economicBenefit;
+        //平均电价
+        String avgFee;
+        //度电成本
+        String cost;
+        if (CharSequenceUtil.equals(oilFieldCode, BusinessConstant.ENV_SY)) {
+            avgFee = "0.6669";
+            cost = "0.3587";
+        } else {
+            avgFee = "0.65";
+            cost = "0.28";
+        }
+        //计算经济效益(万元):光伏累计发电*平均电价-光伏累计发电*度电成本
+        if (photovoltaicPower.compareTo(BigDecimal.ZERO) > 0) {
+            economicBenefit = photovoltaicPower
+                    .multiply(new BigDecimal(avgFee))
+                    .subtract(photovoltaicPower
+                            .multiply(new BigDecimal(cost)))
+                    .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
+        } else {
+            economicBenefit = BigDecimal.ZERO;
+        }
+        return economicBenefit;
+    }
+
     /**
      * 计算累计减碳量(万吨)
      *