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

@@ -625,12 +625,8 @@ public class HomePageService {
                             .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
                     //累计减碳量
                     carbonReduction = ServiceUtil.calculateCarbonReduction(analysisEnt.getPhotovoltaicPower());
-                    //经济效益(万元):光伏累计发电*0.65-光伏累计发电*0.28
-                    economicBenefit = analysisEnt.getPhotovoltaicPower()
-                            .multiply(BigDecimal.valueOf(0.6669))
-                            .subtract(analysisEnt.getPhotovoltaicPower()
-                                    .multiply(BigDecimal.valueOf(0.28)))
-                            .divide(BusinessConstant.BIG_DECIMAL_10000, 2, RoundingMode.HALF_UP);
+                    //经济效益(万元)
+                    economicBenefit = ServiceUtil.getEconomicBenefit(analysisEnt.getPhotovoltaicPower(), oilFieldCode);
                     if (CharSequenceUtil.equals("bb1bff9d-7068-48c9-9be8-c80eb0d49152", stationId)) {
                         greenElectricityRate = "94.03";
                     } else {