From 98d925ee9e40ccffed46f9000ae4f066aa99776b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 15 四月 2026 09:40:26 +0800
Subject: [PATCH] ``` refactor(energy): 优化实时能耗数据服务实现

---
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index de440ca..a1824ee 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -6,17 +6,21 @@
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 public class DeviceMaintenanceDto {
-
 
     @ApiModelProperty("璁惧淇濆吇id")
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
     private Long deviceLedgerId;
+
+    @ApiModelProperty("璁惧鍖哄煙id")
+    private Long areaId;
+
+    @ApiModelProperty("璁惧鍖哄煙鍚嶇О")
+    private String areaName;
 
     @ApiModelProperty("璁惧鍚嶇О")
     private String deviceName;
@@ -28,13 +32,13 @@
     private String maintenancePlanTimeReq;
 
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private LocalDateTime maintenancePlanTime;
+    private String maintenancePlanTime;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private LocalDateTime maintenanceActuallyTime;
+    private String maintenanceActuallyTime;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
     private String maintenanceActuallyTimeReq;
@@ -42,7 +46,7 @@
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
     private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
     private Integer status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")

--
Gitblit v1.9.3