From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java |   87 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
index 431188d..b635e5f 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java
@@ -1,63 +1,106 @@
 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 io.swagger.v3.oas.annotations.media.Schema;
 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")
-@ApiModel("璁惧淇濆吇璁板綍")
+@Schema(name = "璁惧淇濆吇璁板綍")
 public class DeviceMaintenance {
 
-    @ApiModelProperty("璁惧淇濆吇id")
+    @Schema(description = "璁惧淇濆吇id")
     private Long id;
 
-    @ApiModelProperty("璁惧鍙拌处id")
-    private String deviceLedgerId;
+    @Schema(description = "璁惧鍙拌处id")
+    private Long deviceLedgerId;
 
-    @ApiModelProperty("璁″垝淇濆吇鏃ユ湡")
-    private Date maintenancePlanTime;
+    @Schema(description = "淇濆吇浠诲姟id")
+    private Long maintenanceTaskId;
 
-    @ApiModelProperty("瀹為檯淇濆吇浜�")
+    @Schema(description = "棰戞")
+    private String frequencyType;
+
+    @Schema(description = "棰戞璇︽儏")
+    private String frequencyDetail;
+
+    @Schema(description = "涓嬫鎵ц鏃堕棿")
+    private LocalDateTime nextExecutionTime;
+
+    @Schema(description = "鏈�鍚庢墽琛屾椂闂�")
+    private LocalDateTime lastExecutionTime;
+
+    @Schema(description = "璁惧椤圭洰")
+    private String machineryCategory;
+
+
+    private String deviceName;
+
+    private String deviceModel;
+
+    @Schema(description = "璁″垝淇濆吇鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenancePlanTime;
+
+    @Schema(description = "瀹為檯淇濆吇浜�")
     private String maintenanceActuallyName;
 
-    @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡")
-    private Date maintenanceActuallyTime;
+    @Schema(description = "瀹為檯淇濆吇鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime maintenanceActuallyTime;
 
-    @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
-    private Integer maintenanceResult;
+    @Schema(description = "淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ")
+    private String maintenanceResult;
 
-    @ApiModelProperty("鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨")
+    @Schema(description = "鐘舵�� 0 寰呬繚鍏� 1 瀹岀粨 2 澶辫触")
     private Integer status;
 
-    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty("鏇存柊鏃堕棿")
+    @Schema(description = "鏇存柊鏃堕棿")
     @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("鍒涘缓浜�")
+    @Schema(description = "鍒涘缓浜�")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty("鏇存柊浜�")
+    @Schema(description = "鏇存柊浜�")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty("绉熸埛id")
+    @Schema(description = "绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+    @Schema(description = "棰嗙敤澶囦欢ids")
+    private String sparePartsIds;
+
+    @Schema(description = "浣跨敤澶囦欢鍒楄〃")
+    @TableField(exist = false)
+    private List<SparePartUse> sparePartsUseList;
+
+    @Data
+    public static class SparePartUse {
+        private Long id;
+        private Integer quantity;
+    }
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3