feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/ThirdDailyAccumulationEnt.java

@@ -52,6 +52,10 @@ public class ThirdDailyAccumulationEnt implements Serializable {
     @TableField
     private BigDecimal inPlaceConsumption;
 
+    @XText("储能日累计放电量(KWh)")
+    @TableField
+    private BigDecimal energyStorageDischarge;
+
     @XText("入库日期")
     @TableField
     private Date saveDate;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/ThirdDailyAccumulationUpdateEnt.java

@@ -52,6 +52,10 @@ public class ThirdDailyAccumulationUpdateEnt implements Serializable {
     @TableField
     private BigDecimal inPlaceConsumption;
 
+    @XText("储能日累计放电量(KWh)")
+    @TableField
+    private BigDecimal energyStorageDischarge;
+
     @XText("入库日期")
     @TableField
     private Date saveDate;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/ThirdDailyAccumulationUpdateView.java

@@ -55,6 +55,10 @@ public class ThirdDailyAccumulationUpdateView implements Serializable {
     @TableField
     private BigDecimal inPlaceConsumption;
 
+    @XText("储能日累计放电量(KWh)")
+    @TableField
+    private BigDecimal energyStorageDischarge;
+
     @XText("入库日期")
     @TableField
     private Date saveDate;

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/ThirdDailyAccumulationView.java

@@ -54,6 +54,10 @@ public class ThirdDailyAccumulationView implements Serializable {
     @TableField
     private BigDecimal inPlaceConsumption;
 
+    @XText("储能日累计放电量(KWh)")
+    @TableField
+    private BigDecimal energyStorageDischarge;
+
     @XText("入库日期")
     @TableField
     private Date saveDate;

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

@@ -290,6 +290,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .dailyElectricityConsumption(Optional.ofNullable(o.getDailyElectricityConsumption()).orElse(BigDecimal.ZERO))
                             .dailyLiquidProduction(Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO))
                             .inPlaceConsumption(Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO))
+                            .energyStorageDischarge(Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO))
                             .systemSource(ThirdPartyApiConstant.CQ_SOURCE)
                             .build()
             );
@@ -313,6 +314,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
                             .dailyElectricityConsumption(Optional.ofNullable(o.getDailyElectricityConsumption()).orElse(BigDecimal.ZERO))
                             .dailyLiquidProduction(Optional.ofNullable(o.getDailyLiquidProduction()).orElse(BigDecimal.ZERO))
                             .inPlaceConsumption(Optional.ofNullable(o.getInPlaceConsumption()).orElse(BigDecimal.ZERO))
+                            .energyStorageDischarge(Optional.ofNullable(o.getEnergyStorageDischarge()).orElse(BigDecimal.ZERO))
                             .systemSource(ThirdPartyApiConstant.CQ_SOURCE)
                             .saveHour(now)
                             .build()

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/ThirdDailyAccumulationUpdateViewMapper.xml

@@ -10,6 +10,7 @@
         <result column="daily_electricity_consumption" property="dailyElectricityConsumption" jdbcType="DECIMAL"/>
         <result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
         <result column="in_place_consumption" property="inPlaceConsumption" jdbcType="DECIMAL"/>
+        <result column="energy_storage_discharge" property="energyStorageDischarge" jdbcType="DECIMAL"/>
         <result column="save_date" property="saveDate" jdbcType="DATE"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
         <result column="save_hour" property="saveHour" jdbcType="DATE"/>
@@ -24,6 +25,7 @@
     daily_electricity_consumption,
     daily_liquid_production,
     in_place_consumption,
+    energy_storage_discharge,
     save_date,
     system_source,
     save_hour
@@ -47,7 +49,8 @@
 
     <insert id="batchInsertList" parameterType="list">
         INSERT INTO third_daily_accumulation_update ( station_name, station_id, create_date, photovoltaic_power,
-        daily_electricity_consumption, daily_liquid_production, in_place_consumption, save_date, system_source,
+        daily_electricity_consumption, daily_liquid_production, in_place_consumption, energy_storage_discharge,
+        save_date, system_source,
         save_hour)
         VALUES
         <foreach collection="list" item="item" separator=",">
@@ -59,6 +62,7 @@
             #{item.dailyElectricityConsumption},
             #{item.dailyLiquidProduction},
             #{item.inPlaceConsumption},
+            #{item.energyStorageDischarge},
             #{item.saveDate},
             #{item.systemSource},
             #{item.saveHour}

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/ThirdDailyAccumulationViewMapper.xml

@@ -10,6 +10,7 @@
         <result column="daily_electricity_consumption" property="dailyElectricityConsumption" jdbcType="DECIMAL"/>
         <result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
         <result column="in_place_consumption" property="inPlaceConsumption" jdbcType="DECIMAL"/>
+        <result column="energy_storage_discharge" property="energyStorageDischarge" jdbcType="DECIMAL"/>
         <result column="save_date" property="saveDate" jdbcType="DATE"/>
         <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
     </resultMap>
@@ -23,6 +24,7 @@
     daily_electricity_consumption,
     daily_liquid_production,
     in_place_consumption,
+    energy_storage_discharge,
     save_date
     </sql>
     <select id="selectOne" parameterType="pps.core.prediction.entity.ThirdDailyAccumulationView"
@@ -44,7 +46,8 @@
 
     <insert id="batchInsertList" parameterType="list">
         INSERT INTO third_daily_accumulation ( station_name, station_id, create_date, photovoltaic_power,
-        daily_electricity_consumption, daily_liquid_production, in_place_consumption, save_date, system_source )
+        daily_electricity_consumption, daily_liquid_production, in_place_consumption, energy_storage_discharge,
+        save_date, system_source )
         VALUES
         <foreach collection="list" item="item" separator=",">
             (
@@ -55,6 +58,7 @@
             #{item.dailyElectricityConsumption},
             #{item.dailyLiquidProduction},
             #{item.inPlaceConsumption},
+            #{item.energyStorageDischarge},
             #{item.saveDate},
             #{item.systemSource}
             )