From 3804a77bf599e619426255cbaff100e2d4cf4e73 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 15:12:13 +0800
Subject: [PATCH] 增加文件相关接口

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
index 4ed1aff..249e84b 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EquipmentEnergyConsumption.java
@@ -3,14 +3,14 @@
 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.Builder;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @author :yys
@@ -18,7 +18,7 @@
  */
 @Data
 @TableName("equipment_energy_consumption")
-@ApiModel
+@Schema
 public class EquipmentEnergyConsumption {
 
     private static final long serialVersionUID = 1L;
@@ -29,28 +29,28 @@
     /**
      * 璁惧缂栧彿
      */
-    @ApiModelProperty("璁惧缂栧彿")
+    @Schema(description = "璁惧缂栧彿")
     @Excel(name = "璁惧缂栧彿")
     private String code;
 
     /**
      * 璁惧鍚嶇О
      */
-    @ApiModelProperty("璁惧鍚嶇О")
+    @Schema(description = "璁惧鍚嶇О")
     @Excel(name = "璁惧鍚嶇О")
     private String name;
 
     /**
      * 棰濆畾鍔熺巼
      */
-    @ApiModelProperty("棰濆畾鍔熺巼")
+    @Schema(description = "棰濆畾鍔熺巼")
     @Excel(name = "棰濆畾鍔熺巼")
     private String powerRating;
 
     /**
      * 瀹為檯鍔熺巼
      */
-    @ApiModelProperty("瀹為檯鍔熺巼")
+    @Schema(description = "瀹為檯鍔熺巼")
     @Excel(name = "瀹為檯鍔熺巼")
     private String powerActual;
 
@@ -58,21 +58,21 @@
     /**
      * 褰撴棩鐢ㄧ數閲�
      */
-    @ApiModelProperty("褰撴棩鐢ㄧ數閲�")
+    @Schema(description = "褰撴棩鐢ㄧ數閲�")
     @Excel(name = "褰撴棩鐢ㄧ數閲�")
     private BigDecimal dayNum;
 
     /**
      * 鏄ㄧ敤鐢甸噺
      */
-    @ApiModelProperty("鏄ㄧ敤鐢甸噺")
+    @Schema(description = "鏄ㄧ敤鐢甸噺")
     @TableField(exist = false)
     private BigDecimal toDayNum;
 
     /**
      * 鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級
      */
-    @ApiModelProperty("鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
+    @Schema(description = "鏈湀骞冲潎鐢甸噺锛�30澶╄绠楋級")
     @TableField(exist = false)
     private BigDecimal avgNum;
 
@@ -80,28 +80,28 @@
     /**
      * 瓒嬪娍
      */
-    @ApiModelProperty("瓒嬪娍")
+    @Schema(description = "瓒嬪娍")
     @TableField(exist = false)
     private String trend;
 
     /**
      * 绱鐢ㄧ數閲�
      */
-    @ApiModelProperty("绱鐢ㄧ數閲�")
+    @Schema(description = "绱鐢ㄧ數閲�")
     @Excel(name = "绱鐢ㄧ數閲�")
     private BigDecimal sumNum;
     /**
      * 杩愯鏃堕棿
      */
-    @ApiModelProperty("杩愯鏃堕棿")
+    @Schema(description = "杩愯鏃堕棿")
     @Excel(name = "杩愯鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate runDate;
+    private Date runDate;
 
     /**
      * 姣忔棩闄愬埗鐢甸噺
      */
-    @ApiModelProperty("姣忔棩闄愬埗鐢甸噺")
+    @Schema(description = "姣忔棩闄愬埗鐢甸噺")
     @Excel(name = "姣忔棩闄愬埗鐢甸噺")
     private BigDecimal everyNum;
 
@@ -134,5 +134,11 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+    /**
+     *鎵�灞炵敤鐢靛尯鍩焛d
+     */
+    private Long electricityConsumptionAreaId;
 
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3