修改用电时段，区域

yaowanxin

2025-08-11 883a4a64a14de0a5476d1955894a9988a5bff1b7

修改用电时段，区域

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java

@@ -28,6 +28,11 @@
        @ApiModelProperty("区域类型")
        @Excel(name = "区域类型")
        private String areaType;
        /**
         * 排序
         */
        @TableField(fill = FieldFill.INSERT)
        private Long sort;

        /**
         * 父类id

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java

@@ -1,9 +1,13 @@
package com.ruoyi.equipmentenergyconsumption.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@TableName("energy_period")
@ApiModel
@@ -11,17 +15,12 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 开始时间
     * 日期
     */
    @ApiModelProperty("开始时间")
    @Excel(name = "开始时间")
    private String startTime;
    /**
     * 结束时间
     */
    @ApiModelProperty("结束时间")
    @Excel(name = "结束时间")
    private String endTime;
    @ApiModelProperty("日期")
    @Excel(name = "日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date date;
    /**
     * 单价
     */
@@ -33,4 +32,28 @@
     */
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
    /**
     * 峰段
     */
    @ApiModelProperty("峰段")
    @Excel(name = "峰段")
    private Double peak;
    /**
     * 谷段
     */
    @ApiModelProperty("谷段")
    @Excel(name = "谷段")
    private Double valley;
    /**
     * 平段
     */
    @ApiModelProperty("平段")
    @Excel(name = "平段")
    private Double flat;
    /**
     * 尖段
     */
    @ApiModelProperty("尖段")
    @Excel(name = "尖段")
    private Double sharp;
}

 src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml

@@ -7,15 +7,24 @@
    <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
        select * from energy_period
        <where>
            <if test="energyPeriod.startTime != null">
                start_time = #{energyPeriod.startTime}
            </if>
            <if test="energyPeriod.endTime != null">
                and end_time = #{energyPeriod.endTime}
            <if test="energyPeriod.date != null">
                date = #{energyPeriod.date}
            </if>
            <if test="energyPeriod.price != null">
                and price = #{energyPeriod.price}
            </if>
            <if test="energyPeriod.peak != null">
                and peak = #{energyPeriod.peak}
            </if>
            <if test="energyPeriod.valley != null">
                and valley = #{energyPeriod.valley}
            </if>
            <if test="energyPeriod.flat != null">
                and flat = #{energyPeriod.flat}
            </if>
            <if test="energyPeriod.sharp != null">
                and sharp = #{energyPeriod.sharp}
            </if>
        </where>
    </select>
</mapper>

 src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml

@@ -6,12 +6,18 @@
    <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
        select * from electricity_consumption_area
        <where>
            <if test="electricityConsumptionArea.id != null">
                id = #{electricityConsumptionArea.id}
            </if>
            <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
                area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
                and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
            </if>
            <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
                and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
            </if>
            <if test="electricityConsumptionArea.sort != null">
                and sort = #{electricityConsumptionArea.sort}
            </if>
            <if test="electricityConsumptionArea.fuId != null">
                and fu_id = #{electricityConsumptionArea.fuId}
            </if>