feat[零碳项目]: 松原演示

[1.修改井口日用电趋势统计表,增加谷电时段发电时长及谷电占比字段,同时在代码中添加对应字段并修改数据库mapper文件相关业务处理逻辑sql语句;
2.修改线路日用电趋势统计表,增加谷电时段发电时长及谷电占比字段,同时在代码中添加对应字段并修改数据库mapper文件相关业务处理逻辑sql语句;
3.修改井口/线路日用电趋势统计定时任务,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理,同时增加获取每日井口及线路谷电运行时长统计逻辑,完成功能冒烟测试;
4.修改首页总览接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
5.修改首页井场实时监控接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
6.修改首页光伏实时监控接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
7.修改首页井场效果评价接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
8.修改首页井场用能分析接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
9.修改首页线路详情接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
10.修改间开效果评价页累计减碳/累节电能接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
11.修改间开效果评价页井口分析接口逻辑,增加环境区分,通过读取配置表来获取当前部署环境,针对不同环境进行不同业务处理;
]

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/data/well_daily_electricity_trend/GetWellDailyElectricityTrendOutput.java

@@ -36,15 +36,24 @@ public class GetWellDailyElectricityTrendOutput {
     @XText("日减碳量(吨)")
     private BigDecimal dailyCarbonReduction;
 
+    @XText("谷电占比(%)")
+    private BigDecimal valleyElectricRate;
+
     @XText("月绿电占比(%)")
     private BigDecimal monthGreenElectricityRate;
 
     @XText("月减碳量(吨)")
     private BigDecimal monthDailyCarbonReduction;
 
+    @XText("月谷电占比(%)")
+    private BigDecimal monthValleyElectricRate;
+
     @XText("年绿电占比(%)")
     private BigDecimal yearGreenElectricityRate;
 
     @XText("年减碳量(吨)")
     private BigDecimal yearDailyCarbonReduction;
+
+    @XText("年谷电占比(%)")
+    private BigDecimal yearValleyElectricRate;
 }

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

@@ -117,6 +117,12 @@ public class WellDailyElectricityTrendView implements Serializable {
     @TableField(exist = false)
     private BigDecimal monthDailyGreenConsumption;
 
+    /**
+     * 月谷电开井时间(h)
+     */
+    @TableField(exist = false)
+    private BigDecimal monthValleyElectricOpenHour;
+
     /**
      * 年间开运行时长(h)
      */
@@ -134,4 +140,10 @@ public class WellDailyElectricityTrendView implements Serializable {
      */
     @TableField(exist = false)
     private BigDecimal yearDailyGreenConsumption;
+
+    /**
+     * 年谷电开井时间(h)
+     */
+    @TableField(exist = false)
+    private BigDecimal yearValleyElectricOpenHour;
 }

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

@@ -322,10 +322,13 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
                         .dailyLiquidProduction(view.getDailyLiquidProduction())
                         .greenElectricityRate(view.getGreenElectricityRate())
                         .dailyCarbonReduction(view.getDailyCarbonReduction())
+                        .valleyElectricRate(view.getValleyElectricRate())
                         .monthGreenElectricityRate(BaseUtils.getRate(view.getMonthDailyGreenOpenHour(), view.getMonthSpaceRunDuration()))
                         .monthDailyCarbonReduction(view.getMonthDailyGreenConsumption().multiply(BusinessConstant.BIG_DECIMAL_6_67))
+                        .monthValleyElectricRate(BaseUtils.getRate(view.getMonthValleyElectricOpenHour(), view.getMonthSpaceRunDuration()))
                         .yearGreenElectricityRate(BaseUtils.getRate(view.getYearDailyGreenOpenHour(), view.getYearSpaceRunDuration()))
                         .yearDailyCarbonReduction(view.getYearDailyGreenConsumption().multiply(BusinessConstant.BIG_DECIMAL_6_67))
+                        .yearValleyElectricRate(BaseUtils.getRate(view.getYearValleyElectricOpenHour(), view.getYearSpaceRunDuration()))
                         .build());
             }
         } else {

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

@@ -79,9 +79,11 @@
         <result column="month_daily_green_open_hour" property="monthDailyGreenOpenHour" jdbcType="DECIMAL"/>
         <result column="month_space_run_duration" property="monthSpaceRunDuration" jdbcType="DECIMAL"/>
         <result column="month_daily_green_consumption" property="monthDailyGreenConsumption" jdbcType="DECIMAL"/>
+        <result column="month_valley_electric_open_hour" property="monthValleyElectricOpenHour" jdbcType="DECIMAL"/>
         <result column="year_daily_green_open_hour" property="yearDailyGreenOpenHour" jdbcType="DECIMAL"/>
         <result column="year_space_run_duration" property="yearSpaceRunDuration" jdbcType="DECIMAL"/>
         <result column="year_daily_green_consumption" property="yearDailyGreenConsumption" jdbcType="DECIMAL"/>
+        <result column="year_valley_electric_open_hour" property="yearValleyElectricOpenHour" jdbcType="DECIMAL"/>
     </resultMap>
 
     <select id="selectWellheadAnalysisPage" parameterType="pps.core.space.entity.WellDailyElectricityTrendView"
@@ -95,17 +97,21 @@
         t.daily_liquid_production,
         t.green_electricity_rate,
         t.daily_carbon_reduction,
+        t.valley_electric_rate,
         m.month_daily_green_open_hour,
         m.month_space_run_duration,
         m.month_daily_green_consumption,
+        m.month_valley_electric_open_hour,
         y.year_daily_green_open_hour,
         y.year_space_run_duration,
-        y.year_daily_green_consumption
+        y.year_daily_green_consumption,
+        y.year_valley_electric_open_hour
         FROM well_daily_electricity_trend t
         LEFT JOIN (SELECT well_number,
         SUM(daily_green_open_hour) AS month_daily_green_open_hour,
         SUM(space_run_duration) AS month_space_run_duration,
-        SUM(daily_green_consumption) AS month_daily_green_consumption
+        SUM(daily_green_consumption) AS month_daily_green_consumption,
+        SUM(valley_electric_open_hour) AS month_valley_electric_open_hour
         FROM well_daily_electricity_trend
         WHERE
         MONTH ( create_date ) = #{month}
@@ -118,7 +124,8 @@
         LEFT JOIN (SELECT well_number,
         SUM(daily_green_open_hour) AS year_daily_green_open_hour,
         SUM(space_run_duration) AS year_space_run_duration,
-        SUM(daily_green_consumption) AS year_daily_green_consumption
+        SUM(daily_green_consumption) AS year_daily_green_consumption,
+        SUM(valley_electric_open_hour) AS year_valley_electric_open_hour
         FROM well_daily_electricity_trend
         WHERE
         YEAR ( create_date ) = #{year}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetWellheadAnalysisOutput.java

@@ -35,15 +35,24 @@ public class GetWellheadAnalysisOutput {
     @XText("日减碳量(吨)")
     private BigDecimal dailyCarbonReduction;
 
+    @XText("日谷电占比(%)")
+    private BigDecimal valleyElectricRate;
+
     @XText("月绿电占比(%)")
     private BigDecimal monthGreenElectricityRate;
 
     @XText("月减碳量(吨)")
     private BigDecimal monthDailyCarbonReduction;
 
+    @XText("月谷电占比(%)")
+    private BigDecimal monthValleyElectricRate;
+
     @XText("年绿电占比(%)")
     private BigDecimal yearGreenElectricityRate;
 
     @XText("年减碳量(吨)")
     private BigDecimal yearDailyCarbonReduction;
+
+    @XText("年谷电占比(%)")
+    private BigDecimal yearValleyElectricRate;
 }