feat(能源管理系统): 邮件接收

1.统计分析-能耗分析模块重构,删除原有接口及代码,新建能耗分析测试用数据表,生成相关代码并集成到项目中并上传git;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/EnergyConsumptionAnalysisEnt.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 2023/11/23
+ */
+@Data
+@TableName("energy_consumption_analysis")
+public class EnergyConsumptionAnalysisEnt implements Serializable {
+    @XText("ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @XText("线路ID")
+    @TableField
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    @TableField
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    @TableField
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/EnergyConsumptionAnalysisView.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 2023/11/23
+ */
+@Data
+public class EnergyConsumptionAnalysisView implements Serializable {
+    @XText("ID")
+    @TableField
+    private Long id;
+
+    @XText("线路ID")
+    @TableField
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    @TableField
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    @TableField
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    @TableField
+    private Date dataDate;
+}

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

+package pps.core.prediction.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.EnergyConsumptionAnalysisEnt;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Repository(value = "pps.core.prediction.mapper.EnergyConsumptionAnalysisMapper")
+public interface EnergyConsumptionAnalysisMapper extends BaseMapper<EnergyConsumptionAnalysisEnt> {
+}

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

+package pps.core.prediction.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.EnergyConsumptionAnalysisView;
+
+import java.util.List;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Repository(value = "pps.core.prediction.mapper.EnergyConsumptionAnalysisViewMapper")
+public interface EnergyConsumptionAnalysisViewMapper {
+    EnergyConsumptionAnalysisView selectOne(EnergyConsumptionAnalysisView record);
+
+    List<EnergyConsumptionAnalysisView> selectList(EnergyConsumptionAnalysisView record);
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/DynamicQueryEnergyConsumptionAnalysisInput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class DynamicQueryEnergyConsumptionAnalysisInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/DynamicQueryEnergyConsumptionAnalysisOutput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class DynamicQueryEnergyConsumptionAnalysisOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/DynamicQueryEnergyConsumptionAnalysisViewOutput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class DynamicQueryEnergyConsumptionAnalysisViewOutput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetEnergyConsumptionAnalysisInput.java

 package pps.core.prediction.service.data.energy_consumption_analysis;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 能耗分析(模拟数据测试用)
+ * 能耗分析表(测试用)
  *
  * @author ZWT
- * @date 2023/09/20
+ * @date 2023/11/23
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class GetEnergyConsumptionAnalysisInput {
+    @XText("ID")
+    private Long id;
 
-    @XText("组织机构ID")
-    @NotBlank(message = "缺少组织机构ID")
-    private String ouId;
+    @XText("线路ID")
+    private String lineId;
 
-    @NotNull(message = "缺少日期类型")
-    @XText("日期类型(0_今日,1_近7天,2_近30天,3_自定义)")
-    private Integer dateType;
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
 
-    @XText("自定义开始时间")
-    private Date startTime;
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
 
-    @XText("自定义结束时间")
-    private Date endTime;
+    @XText("日期")
+    private Date dataDate;
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetEnergyConsumptionAnalysisOutput.java

@@ -4,22 +4,28 @@ import lombok.Data;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 能耗分析(模拟数据测试用)
+ * 能耗分析表(测试用)
  *
  * @author ZWT
- * @date 2023/09/20
+ * @date 2023/11/23
  */
 @Data
 public class GetEnergyConsumptionAnalysisOutput {
+    @XText("ID")
+    private Long id;
 
-    @XText("小时")
-    private String hourTime;
+    @XText("线路ID")
+    private String lineId;
 
-    @XText("光伏发电")
-    private BigDecimal power;
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
 
-    @XText("光伏用电")
-    private BigDecimal electricityConsumption;
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetEnergyConsumptionAnalysisViewInput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class GetEnergyConsumptionAnalysisViewInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/GetEnergyConsumptionAnalysisViewOutput.java

 package pps.core.prediction.service.data.energy_consumption_analysis;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
-import java.util.List;
+import java.util.Date;
 
 /**
- * 能耗分析(模拟数据测试用)
+ * 能耗分析表(测试用)
  *
  * @author ZWT
- * @date 2023/09/20
+ * @date 2023/11/23
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
 public class GetEnergyConsumptionAnalysisViewOutput {
+    @XText("ID")
+    private Long id;
 
-    @XText("绿电")
-    private BigDecimal greenElectricity;
+    @XText("线路ID")
+    private String lineId;
 
-    @XText("市电")
-    private BigDecimal cityElectricity;
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
 
-    @XText("电量使用趋势")
-    List<GetEnergyConsumptionAnalysisOutput> powerList;
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
 }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/QueryEnergyConsumptionAnalysisInput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class QueryEnergyConsumptionAnalysisInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/QueryEnergyConsumptionAnalysisOutput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class QueryEnergyConsumptionAnalysisOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/QueryEnergyConsumptionAnalysisViewInput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class QueryEnergyConsumptionAnalysisViewInput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/energy_consumption_analysis/QueryEnergyConsumptionAnalysisViewOutput.java

+package pps.core.prediction.service.data.energy_consumption_analysis;
+
+import lombok.Data;
+import xstartup.annotation.XText;
+import xstartup.base.data.XPageInput;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 能耗分析表(测试用)
+ *
+ * @author ZWT
+ * @date 2023/11/23
+ */
+@Data
+public class QueryEnergyConsumptionAnalysisViewOutput extends XPageInput {
+    @XText("ID")
+    private Long id;
+
+    @XText("线路ID")
+    private String lineId;
+
+    @XText("发电量(kWh)")
+    private BigDecimal powerGeneration;
+
+    @XText("用电量(kWh)")
+    private BigDecimal powerConsumption;
+
+    @XText("日期")
+    private Date dataDate;
+}

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/EnergyConsumptionAnalysisViewMapper.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.EnergyConsumptionAnalysisViewMapper">
+    <resultMap id="BaseResultMap" type="pps.core.prediction.entity.EnergyConsumptionAnalysisView">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
+        <result column="power_generation" property="powerGeneration" jdbcType="DECIMAL"/>
+        <result column="power_consumption" property="powerConsumption" jdbcType="DECIMAL"/>
+        <result column="data_date" property="dataDate" jdbcType="DATE"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        ,
+    line_id,
+    power_generation,
+    power_consumption,
+    data_date
+    </sql>
+    <select id="selectOne" parameterType="pps.core.prediction.entity.EnergyConsumptionAnalysisView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from energy_consumption_analysis
+        where
+        id=#{id}
+    </select>
+    <select id="selectList" parameterType="pps.core.prediction.entity.EnergyConsumptionAnalysisView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from energy_consumption_analysis
+        where
+        id=#{id}
+    </select>
+</mapper>
\ No newline at end of file