From 1a89a2eca92540f2a6e9ed5c140b00610f2f4bfc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 14:11:50 +0800
Subject: [PATCH] yys 1.设备巡检，保养加入年维度
---
src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index c018e4d..5d7fcb1 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -1,15 +1,16 @@
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;
+import java.util.List;
@Data
@TableName("device_maintenance")
@@ -22,6 +23,27 @@
@ApiModelProperty("璁惧鍙拌处id")
private Long deviceLedgerId;
+ @ApiModelProperty("璁惧鍖哄煙id")
+ private Long areaId;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁惧鍙拌处ID闆嗗悎")
+ private Long[] deviceLedgerIds;
+
+ @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;
@@ -43,7 +65,7 @@
@ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -53,9 +75,9 @@
private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓浜�")
@@ -69,4 +91,17 @@
@ApiModelProperty("绉熸埛id")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+ @ApiModelProperty("浣跨敤澶囦欢鍒楄〃")
+ @TableField(exist = false)
+ private List<SparePartUse> sparePartsUseList;
+
+ @Data
+ public static class SparePartUse {
+ private Long id;
+ private Integer quantity;
+ }
}
--
Gitblit v1.9.3