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

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

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

@@ -73,6 +73,10 @@ public class LineDailyElectricityTrendEnt implements Serializable {
     @TableField
     private BigDecimal valleyElectricRate;
 
+    @XText("总运行时间(h)")
+    @TableField
+    private BigDecimal sumRunDuration;
+
     @XText("创建时间")
     @TableField
     private Date createDate;

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

@@ -75,6 +75,10 @@ public class LineDailyElectricityTrendView implements Serializable {
     @TableField
     private BigDecimal valleyElectricRate;
 
+    @XText("总运行时间(h)")
+    @TableField
+    private BigDecimal sumRunDuration;
+
     @XText("创建时间")
     @TableField
     private Date createDate;

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

@@ -15,6 +15,7 @@
         <result column="municipal_ratio" property="municipalRatio" jdbcType="DECIMAL"/>
         <result column="valley_electric_open_hour" property="valleyElectricOpenHour" jdbcType="DECIMAL"/>
         <result column="valley_electric_rate" property="valleyElectricRate" jdbcType="DECIMAL"/>
+        <result column="sum_run_duration" property="sumRunDuration" jdbcType="DECIMAL"/>
         <result column="create_date" property="createDate" jdbcType="DATE"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
     </resultMap>
@@ -33,6 +34,7 @@
     municipal_ratio,
     valley_electric_open_hour,
     valley_electric_rate,
+    sum_run_duration,
     create_date,
     system_source
     </sql>
@@ -56,7 +58,8 @@
     <insert id="batchInsert" parameterType="list">
         INSERT INTO line_daily_electricity_trend (station_name, total_power, photovoltaic_power, municipal_power,
         last_total_power, last_photovoltaic_power, last_municipal_power, total_ratio, photovoltaic_ratio,
-        municipal_ratio, valley_electric_open_hour, valley_electric_rate, create_date, system_source) VALUES
+        municipal_ratio, valley_electric_open_hour, valley_electric_rate, sum_run_duration, create_date, system_source)
+        VALUES
         <foreach collection="list" item="item" separator=",">
             (
             #{item.stationName},
@@ -71,6 +74,7 @@
             #{item.municipalRatio},
             #{item.valleyElectricOpenHour},
             #{item.valleyElectricRate},
+            #{item.sumRunDuration},
             #{item.createDate},
             #{item.systemSource}
             )

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/home_page/GetIncomeAnalysisOutput.java

@@ -46,4 +46,10 @@ public class GetIncomeAnalysisOutput {
 
     @XText("零碳井场绿电占比")
     private String zeroGreenElectricityRate;
-}
+
+    @XText("谷电占比(%)")
+    private BigDecimal valleyElectricRate;
+
+    @XText("累计电费(万元)")
+    private BigDecimal accumulatedCharge;
+}
\ No newline at end of file