From fbb48357d807b6e776821decacda68af6b2cc6aa Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 14:02:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java
index 5a75f2a..11a7e54 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceMaintainPlanDTO.java
@@ -16,19 +16,50 @@
*/
package org.sxkj.fw.device.dto;
-import org.sxkj.fw.device.entity.FwDeviceMaintainPlanEntity;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
/**
* 设备维护计划表 数据传输对象实体类
*
- * @author lw
- * @since 2026-01-08
+ * @author Aix
+ * @since 2026-01-09
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceMaintainPlanDTO extends FwDeviceMaintainPlanEntity {
+public class FwDeviceMaintainPlanDTO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ private Long id;
+
+ /**
+ * 设备ID
+ */
+ @ApiModelProperty(value = "设备ID")
+ @NotNull
+ private Long deviceId;
+ /**
+ * 计划周期（每年、每月、每周）
+ */
+ @ApiModelProperty(value = "计划周期（1：每年、2：每月、3：每周）")
+ private String planCycleType;
+ /**
+ * 计划周期具体值，数组对象[1,2,3]
+ */
+ @ApiModelProperty(value = "计划周期具体值，数组对象[1,2,3]")
+ private List<String> planCycleValue;
+
+ // 查询使用
+ @ApiModelProperty(value = "设备名称")
+ private String deviceName;
+ @ApiModelProperty(value = "设备类型")
+ private String deviceType;
+ @ApiModelProperty(value = "所属部门")
+ private Long belongDept;
+
}
--
Gitblit v1.9.3