Commit a1f48a4b authored by ZWT's avatar ZWT

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

1.能耗分析模块功能重构,新增今日/昨日/同期电量统计查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
2.能耗分析模块功能重构,新增今日天气查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
3.能耗分析模块功能重构,新增井场用能分析查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
4.能耗分析模块功能重构,新增井场发电趋势查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
5.能耗分析模块功能重构,新增井场实时监控查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
6.能耗分析模块功能重构,新增本日用电对比查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
7.能耗分析模块功能重构,新增发电详情查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
8.能耗分析模块功能重构,新增用电趋势查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
9.能耗分析模块功能重构,新增用电分析查询接口,添加线上接口文档并完成接口冒烟测试同时添加用例;
10.间开配置Cloud模块添加查询生效中间开井口列表接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 8a16f7fc
......@@ -49,14 +49,9 @@ public class TaskConstant {
public static final String EVERY_MONDAY = "0 0 0 ? * 2";
/**
* 每一天 00:15:00
*/
public static final String EVERY_DAY = "0 15 0 * * ?";
/**
* 每一天 00:30:00
* 每一天 00:00:00
*/
public static final String EVERY_DAY_30 = "0 30 0 * * ?";
public static final String EVERY_DAY_ZERO = "0 0 0 * * ?";
/**
* 每一天 00:05:00
......@@ -79,9 +74,14 @@ public class TaskConstant {
public static final String EVERY_DAY_20 = "0 20 0 * * ?";
/**
* 每一天 00:00:00
* 每一天 00:25:00
*/
public static final String EVERY_DAY_ZERO = "0 0 0 * * ?";
public static final String EVERY_DAY_25 = "0 25 0 * * ?";
/**
* 每一天 00:30:00
*/
public static final String EVERY_DAY_30 = "0 30 0 * * ?";
/**
* 每一天结束时间 23:50:00
......
......@@ -22,12 +22,12 @@ import xstartup.service.job.annotation.XCronTrigger;
public class SpaceCalibrationJob implements XJob {
/**
* 每天00:15执行
* 每天00:25执行
*
* @param xContext x上下文
* @return {@link XServiceResult}
*/
@XCronTrigger(value = TaskConstant.EVERY_DAY)
@XCronTrigger(value = TaskConstant.EVERY_DAY_25)
@Override
public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ SpaceCalibrationJob start:{}", System.currentTimeMillis());
......
......@@ -22,7 +22,7 @@ import xstartup.service.job.annotation.XCronTrigger;
public class ThirdPhotovoltaicPowerJob implements XJob {
/**
* 每天0
* 每天00:05
*
* @param xContext x上下文
* @return {@link XServiceResult}
......
......@@ -22,7 +22,7 @@ import xstartup.service.job.annotation.XCronTrigger;
public class WeatherReceiveJob implements XJob {
/**
* 半小时执行一次
* 半小时隔5分钟执行一次
*
* @param xContext x上下文
* @return {@link XServiceResult}
......
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/22
*/
@Data
@TableName("line_daily_electricity_trend")
public class LineDailyElectricityTrendEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private Long id;
@XText("井组名称(线路/光伏电站)")
@TableField
private String stationName;
@XText("日累计用电量(KWh)")
@TableField
private BigDecimal totalPower;
@XText("光伏日用电量(KWh)")
@TableField
private BigDecimal photovoltaicPower;
@XText("市电日用电量(KWh)")
@TableField
private BigDecimal municipalPower;
@XText("同期日累计用电量(KWh)")
@TableField
private BigDecimal lastTotalPower;
@XText("同期光伏日用电量(KWh)")
@TableField
private BigDecimal lastPhotovoltaicPower;
@XText("同期市电日用电量(KWh)")
@TableField
private BigDecimal lastMunicipalPower;
@XText("累计用电量同比(%)")
@TableField
private BigDecimal totalRatio;
@XText("光伏用电量同比(%)")
@TableField
private BigDecimal photovoltaicRatio;
@XText("市电用电量同比(%)")
@TableField
private BigDecimal municipalRatio;
@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/22
*/
@Data
public class LineDailyElectricityTrendView implements Serializable {
@XText("ID")
@TableField
private Long id;
@XText("井组名称(线路/光伏电站)")
@TableField
private String stationName;
@XText("日累计用电量(KWh)")
@TableField
private BigDecimal totalPower;
@XText("光伏日用电量(KWh)")
@TableField
private BigDecimal photovoltaicPower;
@XText("市电日用电量(KWh)")
@TableField
private BigDecimal municipalPower;
@XText("同期日累计用电量(KWh)")
@TableField
private BigDecimal lastTotalPower;
@XText("同期光伏日用电量(KWh)")
@TableField
private BigDecimal lastPhotovoltaicPower;
@XText("同期市电日用电量(KWh)")
@TableField
private BigDecimal lastMunicipalPower;
@XText("累计用电量同比(%)")
@TableField
private BigDecimal totalRatio;
@XText("光伏用电量同比(%)")
@TableField
private BigDecimal photovoltaicRatio;
@XText("市电用电量同比(%)")
@TableField
private BigDecimal municipalRatio;
@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.LineDailyElectricityTrendEnt;
/**
* 线路日用电趋势
*
* @author ZWT
* @date 2024/05/22
*/
@Repository(value = "pps.core.space.mapper.LineDailyElectricityTrendMapper")
public interface LineDailyElectricityTrendMapper extends BaseMapper<LineDailyElectricityTrendEnt> {
}
package pps.core.space.mapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.LineDailyElectricityTrendView;
import java.util.List;
/**
* 线路日用电趋势
*
* @author ZWT
* @date 2024/05/22
*/
@Repository(value = "pps.core.space.mapper.LineDailyElectricityTrendViewMapper")
public interface LineDailyElectricityTrendViewMapper {
/**
* 选择一个
*
* @param record 记录
* @return {@link LineDailyElectricityTrendView }
*/
LineDailyElectricityTrendView selectOne(LineDailyElectricityTrendView record);
/**
* 选择列表
*
* @param record 记录
* @return {@link List }<{@link LineDailyElectricityTrendView }>
*/
List<LineDailyElectricityTrendView> selectList(LineDailyElectricityTrendView 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.LineDailyElectricityTrendViewMapper">
<resultMap id="BaseResultMap" type="pps.core.space.entity.LineDailyElectricityTrendView">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="station_name" property="stationName" jdbcType="VARCHAR"/>
<result column="total_power" property="totalPower" jdbcType="DECIMAL"/>
<result column="photovoltaic_power" property="photovoltaicPower" jdbcType="DECIMAL"/>
<result column="municipal_power" property="municipalPower" jdbcType="DECIMAL"/>
<result column="last_total_power" property="lastTotalPower" jdbcType="DECIMAL"/>
<result column="last_photovoltaic_power" property="lastPhotovoltaicPower" jdbcType="DECIMAL"/>
<result column="last_municipal_power" property="lastMunicipalPower" jdbcType="DECIMAL"/>
<result column="total_ratio" property="totalRatio" jdbcType="DECIMAL"/>
<result column="photovoltaic_ratio" property="photovoltaicRatio" jdbcType="DECIMAL"/>
<result column="municipal_ratio" property="municipalRatio" 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
,
station_name,
total_power,
photovoltaic_power,
municipal_power,
last_total_power,
last_photovoltaic_power,
last_municipal_power,
total_ratio,
photovoltaic_ratio,
municipal_ratio,
create_date,
system_source
</sql>
<select id="selectOne" parameterType="pps.core.space.entity.LineDailyElectricityTrendView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from line_daily_electricity_trend
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.space.entity.LineDailyElectricityTrendView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from line_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