feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -1800,10 +1800,13 @@ public class EnergyConsumptionAnalysisService {
         for (DateTime dateTime : rangeToList) {
             if (avgMap.containsKey(dateTime)) {
                 //用电*3
-                powerConsumption = avgMap.get(dateTime).multiply(BigDecimal.valueOf(3)).setScale(2, RoundingMode.HALF_UP);
+                powerConsumption = avgMap.get(dateTime).setScale(2, RoundingMode.HALF_UP);
             } else {
                 powerConsumption = defaultPower;
             }
+            if (ObjectUtil.isNotNull(powerConsumption) && powerConsumption.compareTo(BigDecimal.ZERO) > 0) {
+                powerConsumption = powerConsumption.multiply(BigDecimal.valueOf(3));
+            }
             if (powerMap.containsKey(dateTime)) {
                 powerGeneration = powerMap.get(dateTime).setScale(2, RoundingMode.HALF_UP);
             } else {

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

@@ -337,7 +337,10 @@ public class HomePageService {
         BigDecimal defaultPower = CharSequenceUtil.equals(oilFieldCode, BusinessConstant.ENV_CQ) ? BigDecimal.ZERO : null;
         for (DateTime dateTime : rangeToList) {
             //用电*3
-            powerConsumption = avgMap.getOrDefault(dateTime, defaultPower).multiply(BigDecimal.valueOf(3));
+            powerConsumption = avgMap.getOrDefault(dateTime, defaultPower);
+            if (ObjectUtil.isNotNull(powerConsumption) && powerConsumption.compareTo(BigDecimal.ZERO) > 0) {
+                powerConsumption = powerConsumption.multiply(BigDecimal.valueOf(3));
+            }
             powerGeneration = powerMap.getOrDefault(dateTime, BigDecimal.ZERO);
             outputs.add(GetPowerAnalyseOutput.builder()
                     .dateFormat(dateTime.toString(BusinessConstant.DATE_FORMAT_ALL))