From 4ab75b0214e47fd4b2cde6f0eddf5f6cf2981d6d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:01:49 +0800
Subject: [PATCH] 增加记录类型枚举
---
src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
index 568828f..876606c 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java
@@ -1,31 +1,29 @@
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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
+import java.util.Date;
+
@Data
@TableName("energy_period")
-@ApiModel
+@Schema
public class EnergyPeriod {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 寮�濮嬫椂闂�
+ * 鏃ユ湡
*/
- @ApiModelProperty("寮�濮嬫椂闂�")
- @Excel(name = "寮�濮嬫椂闂�")
- private String startTime;
- /**
- * 缁撴潫鏃堕棿
- */
- @ApiModelProperty("缁撴潫鏃堕棿")
- @Excel(name = "缁撴潫鏃堕棿")
- private String endTime;
+ @Schema(description = "鏃ユ湡")
+ @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date date;
/**
* 鍗曚环
*/
- @ApiModelProperty("鍗曚环")
+ @Schema(description = "鍗曚环")
@Excel(name = "鍗曚环")
private Double price;
/**
@@ -33,4 +31,35 @@
*/
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ /**
+ * 宄版
+ */
+ @Schema(description = "宄版")
+ @Excel(name = "宄版")
+ private Double peak;
+ /**
+ * 璋锋
+ */
+ @Schema(description = "璋锋")
+ @Excel(name = "璋锋")
+ private Double valley;
+ /**
+ * 骞虫
+ */
+ @Schema(description = "骞虫")
+ @Excel(name = "骞虫")
+ private Double flat;
+ /**
+ * 灏栨
+ */
+ @Schema(description = "灏栨")
+ @Excel(name = "灏栨")
+ private Double sharp;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3