From 883a4a64a14de0a5476d1955894a9988a5bff1b7 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:02:34 +0800
Subject: [PATCH] 修改用电时段，区域
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java | 5 ++
src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml | 8 +++
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java | 43 ++++++++++++++++-----
src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml | 19 +++++++--
4 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
index 408a13f..e022468 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/ElectricityConsumptionArea.java
+++ b/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
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index 568828f..baba550 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/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;
}
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
index 7a0a384..c026425 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
+++ b/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>
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
index 1018813..aed220c 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml
+++ b/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>
--
Gitblit v1.9.3