feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -59,4 +59,8 @@ public class SpaceYesterdayGreenRateEnt extends BaseModel implements Serializabl
     @XText("绿电占比(优化后)")
     @TableField
     private BigDecimal greenPowerRateOptimize;
+
+    @XText("线路名")
+    @TableField
+    private String lineName;
 }

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

@@ -57,4 +57,8 @@ public class SpaceYesterdayGreenRateView extends BaseModel implements Serializab
     @XText("绿电占比(优化后)")
     @TableField
     private BigDecimal greenPowerRateOptimize;
+
+    @XText("线路名")
+    @TableField
+    private String lineName;
 }

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceYesterdayGreenRateCloudServiceImpl.java

@@ -209,6 +209,7 @@ public class SpaceYesterdayGreenRateCloudServiceImpl extends SpaceOptimizeBaseSe
                 yesterdayGreenRateView.setWellGreenPowerOptimize(wellGreenPowerOptimize);
                 yesterdayGreenRateView.setGreenPowerRateActual(BaseUtils.getRate(wellGreenPowerActual, wellTotalPowerActual));
                 yesterdayGreenRateView.setGreenPowerRateOptimize(BaseUtils.getRate(wellGreenPowerOptimize, wellTotalPowerOptimize));
+                yesterdayGreenRateView.setLineName(lineName);
                 batchList.add(yesterdayGreenRateView);
             }
         }

C11-space/pps-core-space/src/main/resources/mybatis/mapper/pps/core/space/SpaceYesterdayGreenRateViewMapper.xml

@@ -20,6 +20,7 @@
         <result column="well_green_power_optimize" property="wellGreenPowerOptimize" jdbcType="DECIMAL"/>
         <result column="green_power_rate_actual" property="greenPowerRateActual" jdbcType="DECIMAL"/>
         <result column="green_power_rate_optimize" property="greenPowerRateOptimize" jdbcType="DECIMAL"/>
+        <result column="line_name" property="lineName" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         id
@@ -40,7 +41,8 @@
     well_green_power_actual,
     well_green_power_optimize,
     green_power_rate_actual,
-    green_power_rate_optimize
+    green_power_rate_optimize,
+    line_name
     </sql>
     <select id="selectOne" parameterType="pps.core.space.entity.SpaceYesterdayGreenRateView" resultMap="BaseResultMap">
         select
@@ -61,7 +63,7 @@
         INSERT INTO space_yesterday_green_rate (id, create_by_id, create_by_name, create_time, modify_by_id,
         modify_by_name, modify_time, wellhead_id, well_number, record_date, start_seq, well_total_power_actual,
         well_total_power_optimize, well_green_power_actual, well_green_power_optimize, green_power_rate_actual,
-        green_power_rate_optimize)
+        green_power_rate_optimize, line_name)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -81,7 +83,8 @@
             #{item.wellGreenPowerActual},
             #{item.wellGreenPowerOptimize},
             #{item.greenPowerRateActual},
-            #{item.greenPowerRateOptimize}
+            #{item.greenPowerRateOptimize},
+            #{item.lineName}
             )
         </foreach>
     </insert>