feat(吉林演示): 松原

1.开发中间库表结构及数据导出功能,检查中间库表结构是否有变动,同时获取最新数据,验证数据是否更新;
2.创建场站每日信息统计记录表,新建场站日信息数据采集汇总定时任务,整理汇总场站纬度每日数据,完成功能验证;
3.针对吉林提供的统计数据,对吉林首页部分功能修改;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C10-task/pps-core-task/src/main/java/pps/core/task/job/DailyElectricityTrendJob.java

@@ -22,7 +22,7 @@ import xstartup.data.XServiceResult;
 public class DailyElectricityTrendJob {
 
     /**
-     * 每天0点12执行(跑前一天数据)
+     * 每天0点12执行(跑前一天数据)     0 12 0 * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult}

C10-task/pps-core-task/src/main/java/pps/core/task/job/EnergyConsumptionAnalysisJob.java

@@ -22,7 +22,7 @@ import xstartup.data.XServiceResult;
 public class EnergyConsumptionAnalysisJob {
 
     /**
-     * 每天0点30执行
+     * 每天0点30执行  0 30 0 * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult}

C10-task/pps-core-task/src/main/java/pps/core/task/job/PhotovoltaicTrainJob.java

@@ -23,7 +23,7 @@ import xstartup.data.XServiceResult;
 public class PhotovoltaicTrainJob {
 
     /**
-     * 每三天执行
+     * 每三天执行    0 0 0 1/3 * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult}

C10-task/pps-core-task/src/main/java/pps/core/task/job/ThirdPhotovoltaicPowerJob.java

@@ -20,7 +20,7 @@ import xstartup.data.XServiceResult;
 public class ThirdPhotovoltaicPowerJob {
 
     /**
-     * 每天00:05
+     * 每天00:05  0 5 0 * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult}

C10-task/pps-core-task/src/main/java/pps/core/task/job/ThirdWindPowerGenerationJob.java

@@ -23,7 +23,7 @@ import xstartup.data.XServiceResult;
 public class ThirdWindPowerGenerationJob {
 
     /**
-     * 每半小时隔1分钟执行
+     * 每半小时隔1分钟执行   0 1/30 * * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult }

C10-task/pps-core-task/src/main/java/pps/core/task/job/WeatherApiReceiveJob.java

@@ -19,7 +19,7 @@ import xstartup.data.XServiceResult;
 public class WeatherApiReceiveJob {
 
     /**
-     * 早/晚九点十五分执行
+     * 早/晚九点十五分执行   0 15 9/12 * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult}

C10-task/pps-core-task/src/main/java/pps/core/task/job/WeatherReceiveJob.java

@@ -20,7 +20,7 @@ import xstartup.data.XServiceResult;
 public class WeatherReceiveJob {
 
     /**
-     * 半小时隔5分钟执行一次
+     * 每两小时隔5分钟执行一次  0 5 0/2 * * ?
      *
      * @param xContext     x上下文
      * @param oilFieldCode 油田代码

C10-task/pps-core-task/src/main/java/pps/core/task/job/WellTechDailyJob.java

@@ -20,7 +20,7 @@ import xstartup.data.XServiceResult;
 public class WellTechDailyJob {
 
     /**
-     * 每天0点执行
+     * 每天0点执行   0 0 0 * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult}

C10-task/pps-core-task/src/main/java/pps/core/task/job/WindPredictionHistoryJob.java

@@ -22,7 +22,7 @@ import xstartup.data.XServiceResult;
 public class WindPredictionHistoryJob {
 
     /**
-     * 每天00:12执行
+     * 每天00:12执行    0 12 0 * * ?
      *
      * @param xContext x上下文
      * @return {@link XServiceResult }

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

+package pps.core.prediction.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/10/20
+ */
+@Data
+@TableName("station_daily_production_situation")
+public class StationDailyProductionSituationEnt implements Serializable {
+    @XText("ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    @TableField
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    @TableField
+    private String stationId;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+
+    @XText("生产时间(h)")
+    @TableField
+    private BigDecimal productionTime;
+
+    @XText("日耗电量(kW-h)")
+    @TableField
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日产液量(m³)")
+    @TableField
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("日市电用电量")
+    @TableField
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    @TableField
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    @TableField
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    @TableField
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    @TableField
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    @TableField
+    private BigDecimal alleyHoursTariff;
+
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
+
+    @XText("创建时间")
+    @TableField
+    private Date createDate;
+}

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

+package pps.core.prediction.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/10/20
+ */
+@Data
+public class StationDailyProductionSituationView implements Serializable {
+    @XText("ID")
+    @TableField
+    private Long id;
+
+    @XText("井组名称(线路/光伏电站)")
+    @TableField
+    private String stationName;
+
+    @XText("井组ID(光伏电站)")
+    @TableField
+    private String stationId;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+
+    @XText("生产时间(h)")
+    @TableField
+    private BigDecimal productionTime;
+
+    @XText("日耗电量(kW-h)")
+    @TableField
+    private BigDecimal dailyElectricityConsumption;
+
+    @XText("日产液量(m³)")
+    @TableField
+    private BigDecimal dailyLiquidProduction;
+
+    @XText("日市电用电量")
+    @TableField
+    private BigDecimal dailyUtilityElectricityConsumption;
+
+    @XText("尖峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionPh;
+
+    @XText("高峰时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionHh;
+
+    @XText("平时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionNp;
+
+    @XText("谷时段用电量")
+    @TableField
+    private BigDecimal electricityConsumptionVh;
+
+    @XText("日市电用电费")
+    @TableField
+    private BigDecimal electricityChargeCity;
+
+    @XText("尖峰时段电费")
+    @TableField
+    private BigDecimal electricityChargesPh;
+
+    @XText("高峰时段电费")
+    @TableField
+    private BigDecimal peakHourTariff;
+
+    @XText("平时段电费")
+    @TableField
+    private BigDecimal normalPeriodTariff;
+
+    @XText("谷时段用电费")
+    @TableField
+    private BigDecimal alleyHoursTariff;
+
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
+
+    @XText("创建时间")
+    @TableField
+    private Date createDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/StationDailyProductionSituationMapper.java

+package pps.core.prediction.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.StationDailyProductionSituationEnt;
+
+/**
+ * 光伏电站生产情况表(每日统计)
+ *
+ * @author ZWT
+ * @date 2024/10/20
+ */
+@Repository(value="pps.core.prediction.mapper.StationDailyProductionSituationMapper")
+public interface StationDailyProductionSituationMapper extends BaseMapper<StationDailyProductionSituationEnt> {
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/StationDailyProductionSituationViewMapper.java

+package pps.core.prediction.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.StationDailyProductionSituationView;
+
+import java.util.List;
+
+/**
+ * 光伏电站生产情况表(每日统计)
+ *
+ * @author ZWT
+ * @date 2024/10/20
+ */
+@Repository(value = "pps.core.prediction.mapper.StationDailyProductionSituationViewMapper")
+public interface StationDailyProductionSituationViewMapper {
+    StationDailyProductionSituationView selectOne(StationDailyProductionSituationView record);
+
+    List<StationDailyProductionSituationView> selectList(StationDailyProductionSituationView record);
+}

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

+<?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.prediction.mapper.StationDailyProductionSituationViewMapper">
+  <resultMap id="BaseResultMap" type="pps.core.prediction.entity.StationDailyProductionSituationView">
+    <id column="id" property="id" jdbcType="BIGINT" />
+    <result column="station_name" property="stationName" jdbcType="VARCHAR" />
+    <result column="station_id" property="stationId" jdbcType="VARCHAR" />
+    <result column="data_date" property="dataDate" jdbcType="DATE" />
+    <result column="production_time" property="productionTime" jdbcType="DECIMAL" />
+    <result column="daily_electricity_consumption" property="dailyElectricityConsumption" jdbcType="DECIMAL" />
+    <result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL" />
+    <result column="daily_utility_electricity_consumption" property="dailyUtilityElectricityConsumption" jdbcType="DECIMAL" />
+    <result column="electricity_consumption_ph" property="electricityConsumptionPh" jdbcType="DECIMAL" />
+    <result column="electricity_consumption_hh" property="electricityConsumptionHh" jdbcType="DECIMAL" />
+    <result column="electricity_consumption_np" property="electricityConsumptionNp" jdbcType="DECIMAL" />
+    <result column="electricity_consumption_vh" property="electricityConsumptionVh" jdbcType="DECIMAL" />
+    <result column="electricity_charge_city" property="electricityChargeCity" jdbcType="DECIMAL" />
+    <result column="electricity_charges_ph" property="electricityChargesPh" jdbcType="DECIMAL" />
+    <result column="peak_hour_tariff" property="peakHourTariff" jdbcType="DECIMAL" />
+    <result column="normal_period_tariff" property="normalPeriodTariff" jdbcType="DECIMAL" />
+    <result column="alley_hours_tariff" property="alleyHoursTariff" jdbcType="DECIMAL" />
+    <result column="system_source" property="systemSource" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="DATE" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id
+    ,
+    station_name,
+    station_id,
+    data_date,
+    production_time,
+    daily_electricity_consumption,
+    daily_liquid_production,
+    daily_utility_electricity_consumption,
+    electricity_consumption_ph,
+    electricity_consumption_hh,
+    electricity_consumption_np,
+    electricity_consumption_vh,
+    electricity_charge_city,
+    electricity_charges_ph,
+    peak_hour_tariff,
+    normal_period_tariff,
+    alley_hours_tariff,
+    system_source,
+    create_date
+  </sql>
+  <select id="selectOne" parameterType="pps.core.prediction.entity.StationDailyProductionSituationView" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from station_daily_production_situation
+    where 
+    id=#{id}
+  </select>
+  <select id="selectList" parameterType="pps.core.prediction.entity.StationDailyProductionSituationView" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from station_daily_production_situation
+    where 
+    id=#{id}
+  </select>
+</mapper>
\ No newline at end of file