feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C00-common/pps-common/src/main/java/pps/core/common/constant/BusinessConstant.java

@@ -195,7 +195,6 @@ public class BusinessConstant {
      */
     public static final BigDecimal BIG_DECIMAL_0_4 = BigDecimal.valueOf(0.4);
 
-
     /**
      * 2
      */
@@ -211,6 +210,11 @@ public class BusinessConstant {
      */
     public static final BigDecimal BIG_DECIMAL_4 = BigDecimal.valueOf(4);
 
+    /**
+     * 15
+     */
+    public static final BigDecimal BIG_DECIMAL_15 = BigDecimal.valueOf(15);
+
     /**
      * 24
      */

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeEffectEnt.java

@@ -40,27 +40,27 @@ public class SpaceOptimizeEffectEnt extends BaseModel implements Serializable {
     @TableField
     private String optimalResult;
 
-    @XText("优化前总开井时长(h)")
+    @XText("优化前总开井时长(min)")
     @TableField
     private BigDecimal totalDuration;
 
-    @XText("优化前绿电开井时长(h)")
+    @XText("优化前绿电开井时长(min)")
     @TableField
     private BigDecimal greenPowerDuration;
 
-    @XText("优化前谷电开井时长(h)")
+    @XText("优化前谷电开井时长(min)")
     @TableField
     private BigDecimal lowPowerDuration;
 
-    @XText("优化前平电开井时长(h)")
+    @XText("优化前平电开井时长(min)")
     @TableField
     private BigDecimal midPowerDuration;
 
-    @XText("优化前高峰电开井时长(h)")
+    @XText("优化前高峰电开井时长(min)")
     @TableField
     private BigDecimal highPowerDuration;
 
-    @XText("优化前尖峰电开井时长(h)")
+    @XText("优化前尖峰电开井时长(min)")
     @TableField
     private BigDecimal peakPowerDuration;
 
@@ -72,27 +72,27 @@ public class SpaceOptimizeEffectEnt extends BaseModel implements Serializable {
     @TableField
     private BigDecimal powerCost;
 
-    @XText("优化后总开井时长(h)")
+    @XText("优化后总开井时长(min)")
     @TableField
     private BigDecimal optimalTotalDuration;
 
-    @XText("优化后绿电开井时长(h)")
+    @XText("优化后绿电开井时长(min)")
     @TableField
     private BigDecimal optimalGreenPowerDuration;
 
-    @XText("优化后谷电开井时长(h)")
+    @XText("优化后谷电开井时长(min)")
     @TableField
     private BigDecimal optimalLowPowerDuration;
 
-    @XText("优化后平电开井时长(h)")
+    @XText("优化后平电开井时长(min)")
     @TableField
     private BigDecimal optimalMidPowerDuration;
 
-    @XText("优化后高峰电开井时长(h)")
+    @XText("优化后高峰电开井时长(min)")
     @TableField
     private BigDecimal optimalHighPowerDuration;
 
-    @XText("优化后尖峰电开井时长(h)")
+    @XText("优化后尖峰电开井时长(min)")
     @TableField
     private BigDecimal optimalPeakPowerDuration;
 

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeEffectView.java

@@ -38,27 +38,27 @@ public class SpaceOptimizeEffectView extends BaseModel implements Serializable {
     @TableField
     private String optimalResult;
 
-    @XText("优化前总开井时长(h)")
+    @XText("优化前总开井时长(min)")
     @TableField
     private BigDecimal totalDuration;
 
-    @XText("优化前绿电开井时长(h)")
+    @XText("优化前绿电开井时长(min)")
     @TableField
     private BigDecimal greenPowerDuration;
 
-    @XText("优化前谷电开井时长(h)")
+    @XText("优化前谷电开井时长(min)")
     @TableField
     private BigDecimal lowPowerDuration;
 
-    @XText("优化前平电开井时长(h)")
+    @XText("优化前平电开井时长(min)")
     @TableField
     private BigDecimal midPowerDuration;
 
-    @XText("优化前高峰电开井时长(h)")
+    @XText("优化前高峰电开井时长(min)")
     @TableField
     private BigDecimal highPowerDuration;
 
-    @XText("优化前尖峰电开井时长(h)")
+    @XText("优化前尖峰电开井时长(min)")
     @TableField
     private BigDecimal peakPowerDuration;
 
@@ -70,27 +70,27 @@ public class SpaceOptimizeEffectView extends BaseModel implements Serializable {
     @TableField
     private BigDecimal powerCost;
 
-    @XText("优化后总开井时长(h)")
+    @XText("优化后总开井时长(min)")
     @TableField
     private BigDecimal optimalTotalDuration;
 
-    @XText("优化后绿电开井时长(h)")
+    @XText("优化后绿电开井时长(min)")
     @TableField
     private BigDecimal optimalGreenPowerDuration;
 
-    @XText("优化后谷电开井时长(h)")
+    @XText("优化后谷电开井时长(min)")
     @TableField
     private BigDecimal optimalLowPowerDuration;
 
-    @XText("优化后平电开井时长(h)")
+    @XText("优化后平电开井时长(min)")
     @TableField
     private BigDecimal optimalMidPowerDuration;
 
-    @XText("优化后高峰电开井时长(h)")
+    @XText("优化后高峰电开井时长(min)")
     @TableField
     private BigDecimal optimalHighPowerDuration;
 
-    @XText("优化后尖峰电开井时长(h)")
+    @XText("优化后尖峰电开井时长(min)")
     @TableField
     private BigDecimal optimalPeakPowerDuration;