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/pojo/DeviceMaintenance.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index eb655a8..18f3e45 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -1,15 +1,15 @@
 package com.ruoyi.device.pojo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 @TableName("device_maintenance")
@@ -21,6 +21,21 @@
 
     @ApiModelProperty("璁惧鍙拌处id")
     private Long deviceLedgerId;
+
+    @ApiModelProperty("淇濆吇浠诲姟id")
+    private Long maintenanceTaskId;
+
+    @ApiModelProperty(value = "棰戞")
+    private String frequencyType;
+
+    @ApiModelProperty(value = "棰戞璇︽儏")
+    private String frequencyDetail;
+
+    @ApiModelProperty(value = "涓嬫鎵ц鏃堕棿")
+    private LocalDateTime nextExecutionTime;
+
+    @ApiModelProperty(value = "鏈�鍚庢墽琛屾椂闂�")
+    private LocalDateTime lastExecutionTime;
 
 
     private String deviceName;
@@ -34,6 +49,12 @@
 
     @ApiModelProperty("瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
+
+    @ApiModelProperty("璁″垝淇濆吇浜篿d")
+    private Long maintenancePersonId;
+
+    @ApiModelProperty("璁″垝淇濆吇浜�")
+    private String maintenancePerson;
 
     @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -69,4 +90,7 @@
     @ApiModelProperty("绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    @ApiModelProperty("璁惧淇濆吇浣嶇疆")
+    private String maintenanceLocation;
 }

--
Gitblit v1.9.3