From 089964a497c2528e88ddc610af5f88f631303431 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 15:28:16 +0800
Subject: [PATCH] feat: 设备保养新增任务状态,启动/停止与调度器关联

---
 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
index 2714544..64f4011 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java
@@ -6,14 +6,12 @@
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 public class DeviceMaintenanceDto {
 
 
     @ApiModelProperty("璁惧淇濆吇id")
-
     private Long id;
 
     @ApiModelProperty("璁惧鍙拌处id")
@@ -25,19 +23,31 @@
     @ApiModelProperty("瑙勬牸鍨嬪彿")
     private String deviceModel;
 
+    @ApiModelProperty("璁惧淇濆吇浣嶇疆")
+    private String maintenanceLocation;
+
     @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private LocalDateTime maintenancePlanTime;
+    private String maintenancePlanTimeReq;
+
+    @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
+    private String maintenancePlanTime;
+
+    @ApiModelProperty("璁″垝淇濆吇浜�")
+    private String maintenancePerson;
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private LocalDateTime maintenanceActuallyTime;
+    private String maintenanceActuallyTime;
+
+    @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
+    private String maintenanceActuallyTimeReq;
 
     @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
-    private Integer maintenanceResult;
+    private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
     private Integer status;
 
     @ApiModelProperty("鍒涘缓鏃堕棿")

--
Gitblit v1.9.3