Commit ca59869c authored by ZWT's avatar ZWT

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

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent dffce57d
package pps.core.space.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 井口日用电趋势
*
* @author ZWT
* @date 2024/05/24
*/
@Data
@TableName("well_daily_electricity_trend")
public class WellDailyElectricityTrendEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private Long id;
@XText("井号")
@TableField
private String wellNumber;
@XText("每日开井时间(h)")
@TableField
private BigDecimal dailyOpenHour;
@XText("绿电开井时间(h)")
@TableField
private BigDecimal dailyGreenOpenHour;
@XText("日耗电量(kW-h)")
@TableField
private BigDecimal dailyElectricityConsumption;
@XText("日产液量(m³)")
@TableField
private BigDecimal dailyLiquidProduction;
@XText("日减碳量(吨)")
@TableField
private BigDecimal dailyCarbonReduction;
@XText("绿电占比(%)")
@TableField
private BigDecimal greenElectricityRate;
@XText("创建时间")
@TableField
private Date createDate;
@XText("来源系统")
@TableField
private String systemSource;
}
package pps.core.space.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 井口日用电趋势
*
* @author ZWT
* @date 2024/05/24
*/
@Data
public class WellDailyElectricityTrendView implements Serializable {
@XText("ID")
@TableField
private Long id;
@XText("井号")
@TableField
private String wellNumber;
@XText("每日开井时间(h)")
@TableField
private BigDecimal dailyOpenHour;
@XText("绿电开井时间(h)")
@TableField
private BigDecimal dailyGreenOpenHour;
@XText("日耗电量(kW-h)")
@TableField
private BigDecimal dailyElectricityConsumption;
@XText("日产液量(m³)")
@TableField
private BigDecimal dailyLiquidProduction;
@XText("日减碳量(吨)")
@TableField
private BigDecimal dailyCarbonReduction;
@XText("绿电占比(%)")
@TableField
private BigDecimal greenElectricityRate;
@XText("创建时间")
@TableField
private Date createDate;
@XText("来源系统")
@TableField
private String systemSource;
}
package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.WellDailyElectricityTrendEnt;
/**
* 井口日用电趋势
*
* @author ZWT
* @date 2024/05/24
*/
@Repository(value = "pps.core.space.mapper.WellDailyElectricityTrendMapper")
public interface WellDailyElectricityTrendMapper extends BaseMapper<WellDailyElectricityTrendEnt> {
}
package pps.core.space.mapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.WellDailyElectricityTrendView;
import java.util.List;
/**
* 井口日用电趋势
*
* @author ZWT
* @date 2024/05/24
*/
@Repository(value = "pps.core.space.mapper.WellDailyElectricityTrendViewMapper")
public interface WellDailyElectricityTrendViewMapper {
/**
* 查一个
*
* @param record 记录
* @return {@link WellDailyElectricityTrendView }
*/
WellDailyElectricityTrendView selectOne(WellDailyElectricityTrendView record);
/**
* 查列表
*
* @param record 记录
* @return {@link List }<{@link WellDailyElectricityTrendView }>
*/
List<WellDailyElectricityTrendView> selectList(WellDailyElectricityTrendView record);
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.space.mapper.WellDailyElectricityTrendViewMapper">
<resultMap id="BaseResultMap" type="pps.core.space.entity.WellDailyElectricityTrendView">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
<result column="daily_open_hour" property="dailyOpenHour" jdbcType="DECIMAL"/>
<result column="daily_green_open_hour" property="dailyGreenOpenHour" jdbcType="DECIMAL"/>
<result column="daily_electricity_consumption" property="dailyElectricityConsumption" jdbcType="DECIMAL"/>
<result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
<result column="daily_carbon_reduction" property="dailyCarbonReduction" jdbcType="DECIMAL"/>
<result column="green_electricity_rate" property="greenElectricityRate" jdbcType="DECIMAL"/>
<result column="create_date" property="createDate" jdbcType="DATE"/>
<result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id
,
well_number,
daily_open_hour,
daily_green_open_hour,
daily_electricity_consumption,
daily_liquid_production,
daily_carbon_reduction,
green_electricity_rate,
create_date,
system_source
</sql>
<select id="selectOne" parameterType="pps.core.space.entity.WellDailyElectricityTrendView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from well_daily_electricity_trend
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.space.entity.WellDailyElectricityTrendView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from well_daily_electricity_trend
where
id=#{id}
</select>
</mapper>
\ No newline at end of file
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