Commit 7a377485 authored by ZWT's avatar ZWT

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

1.新建油田配置表同时生成相关代码及mapper文件,修改部分第三方数据抽取定时任务,增加针对不同井场开关控制逻辑,同时修改首页页面展示逻辑,通过油田配置功能区分不同首页展示功能;
2.新建定时任务配置表同时生成相关代码及mapper文件,定时任务模块增加mybatis配置,用以操作数据库,修改部分第三方数据抽取定时任务,修改使用方式使其脱离框架方便动态控制;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 8e712172
...@@ -65,6 +65,14 @@ public class LineDailyElectricityTrendEnt implements Serializable { ...@@ -65,6 +65,14 @@ public class LineDailyElectricityTrendEnt implements Serializable {
@TableField @TableField
private BigDecimal municipalRatio; private BigDecimal municipalRatio;
@XText("谷电开井时间(h)")
@TableField
private BigDecimal valleyElectricOpenHour;
@XText("谷电占比(%)")
@TableField
private BigDecimal valleyElectricRate;
@XText("创建时间") @XText("创建时间")
@TableField @TableField
private Date createDate; private Date createDate;
......
...@@ -67,6 +67,14 @@ public class LineDailyElectricityTrendView implements Serializable { ...@@ -67,6 +67,14 @@ public class LineDailyElectricityTrendView implements Serializable {
@TableField @TableField
private BigDecimal municipalRatio; private BigDecimal municipalRatio;
@XText("谷电开井时间(h)")
@TableField
private BigDecimal valleyElectricOpenHour;
@XText("谷电占比(%)")
@TableField
private BigDecimal valleyElectricRate;
@XText("创建时间") @XText("创建时间")
@TableField @TableField
private Date createDate; private Date createDate;
......
...@@ -60,6 +60,14 @@ public class WellDailyElectricityTrendEnt implements Serializable { ...@@ -60,6 +60,14 @@ public class WellDailyElectricityTrendEnt implements Serializable {
@TableField @TableField
private BigDecimal greenElectricityRate; private BigDecimal greenElectricityRate;
@XText("谷电开井时间(h)")
@TableField
private BigDecimal valleyElectricOpenHour;
@XText("谷电占比(%)")
@TableField
private BigDecimal valleyElectricRate;
@XText("创建时间") @XText("创建时间")
@TableField @TableField
private Date createDate; private Date createDate;
......
...@@ -63,6 +63,14 @@ public class WellDailyElectricityTrendView implements Serializable { ...@@ -63,6 +63,14 @@ public class WellDailyElectricityTrendView implements Serializable {
@TableField @TableField
private BigDecimal greenElectricityRate; private BigDecimal greenElectricityRate;
@XText("谷电开井时间(h)")
@TableField
private BigDecimal valleyElectricOpenHour;
@XText("谷电占比(%)")
@TableField
private BigDecimal valleyElectricRate;
@XText("创建时间") @XText("创建时间")
@TableField @TableField
private Date createDate; private Date createDate;
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
<result column="total_ratio" property="totalRatio" jdbcType="DECIMAL"/> <result column="total_ratio" property="totalRatio" jdbcType="DECIMAL"/>
<result column="photovoltaic_ratio" property="photovoltaicRatio" jdbcType="DECIMAL"/> <result column="photovoltaic_ratio" property="photovoltaicRatio" jdbcType="DECIMAL"/>
<result column="municipal_ratio" property="municipalRatio" jdbcType="DECIMAL"/> <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="create_date" property="createDate" jdbcType="DATE"/> <result column="create_date" property="createDate" jdbcType="DATE"/>
<result column="system_source" property="systemSource" jdbcType="VARCHAR"/> <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
...@@ -29,6 +31,8 @@ ...@@ -29,6 +31,8 @@
total_ratio, total_ratio,
photovoltaic_ratio, photovoltaic_ratio,
municipal_ratio, municipal_ratio,
valley_electric_open_hour,
valley_electric_rate,
create_date, create_date,
system_source system_source
</sql> </sql>
...@@ -52,7 +56,7 @@ ...@@ -52,7 +56,7 @@
<insert id="batchInsert" parameterType="list"> <insert id="batchInsert" parameterType="list">
INSERT INTO line_daily_electricity_trend (station_name, total_power, photovoltaic_power, municipal_power, 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, last_total_power, last_photovoltaic_power, last_municipal_power, total_ratio, photovoltaic_ratio,
municipal_ratio, create_date, system_source) VALUES municipal_ratio, valley_electric_open_hour, valley_electric_rate, create_date, system_source) VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
#{item.stationName}, #{item.stationName},
...@@ -65,6 +69,8 @@ ...@@ -65,6 +69,8 @@
#{item.totalRatio}, #{item.totalRatio},
#{item.photovoltaicRatio}, #{item.photovoltaicRatio},
#{item.municipalRatio}, #{item.municipalRatio},
#{item.valleyElectricOpenHour},
#{item.valleyElectricRate},
#{item.createDate}, #{item.createDate},
#{item.systemSource} #{item.systemSource}
) )
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/> <result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
<result column="daily_carbon_reduction" property="dailyCarbonReduction" jdbcType="DECIMAL"/> <result column="daily_carbon_reduction" property="dailyCarbonReduction" jdbcType="DECIMAL"/>
<result column="green_electricity_rate" property="greenElectricityRate" jdbcType="DECIMAL"/> <result column="green_electricity_rate" property="greenElectricityRate" jdbcType="DECIMAL"/>
<result column="valley_electric_open_hour" property="valleyElectricOpenHour" jdbcType="DECIMAL"/>
<result column="valley_electric_rate" property="valleyElectricRate" jdbcType="DECIMAL"/>
<result column="create_date" property="createDate" jdbcType="DATE"/> <result column="create_date" property="createDate" jdbcType="DATE"/>
<result column="system_source" property="systemSource" jdbcType="VARCHAR"/> <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
...@@ -27,6 +29,8 @@ ...@@ -27,6 +29,8 @@
daily_liquid_production, daily_liquid_production,
daily_carbon_reduction, daily_carbon_reduction,
green_electricity_rate, green_electricity_rate,
valley_electric_open_hour,
valley_electric_rate,
create_date, create_date,
system_source system_source
</sql> </sql>
...@@ -50,7 +54,8 @@ ...@@ -50,7 +54,8 @@
<insert id="batchInsert" parameterType="list"> <insert id="batchInsert" parameterType="list">
INSERT INTO well_daily_electricity_trend (well_number, space_run_duration, daily_open_hour, INSERT INTO well_daily_electricity_trend (well_number, space_run_duration, daily_open_hour,
daily_green_open_hour, daily_green_consumption, daily_electricity_consumption, daily_liquid_production, daily_green_open_hour, daily_green_consumption, daily_electricity_consumption, daily_liquid_production,
daily_carbon_reduction, green_electricity_rate, create_date, system_source) VALUES daily_carbon_reduction, green_electricity_rate, valley_electric_open_hour, valley_electric_rate, create_date,
system_source) VALUES
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
( (
#{item.wellNumber}, #{item.wellNumber},
...@@ -62,6 +67,8 @@ ...@@ -62,6 +67,8 @@
#{item.dailyLiquidProduction}, #{item.dailyLiquidProduction},
#{item.dailyCarbonReduction}, #{item.dailyCarbonReduction},
#{item.greenElectricityRate}, #{item.greenElectricityRate},
#{item.valleyElectricOpenHour},
#{item.valleyElectricRate},
#{item.createDate}, #{item.createDate},
#{item.systemSource} #{item.systemSource}
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment