From 1f9f5596657af4af7e4e7da735358a0f00d64bbc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 09:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
index ebf0978..15f4ce0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
@@ -16,25 +16,65 @@
*/
package org.sxkj.fw.device.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
/**
* 设备维护计划表 实体类
*
- * @author lw
- * @since 2026-01-07
+ * @author Aix
+ * @since 2026-01-09
*/
@Data
-@TableName("ja_fw_device_maintain_plan")
+@TableName(value ="ja_fw_device_maintain_plan", autoResultMap = true)
@ApiModel(value = "FwDeviceMaintainPlan对象", description = "设备维护计划表")
@EqualsAndHashCode(callSuper = true)
public class FwDeviceMaintainPlanEntity extends BaseEntity {
+ /**
+ * 设备ID
+ */
+ @ApiModelProperty(value = "设备ID")
+ private Long deviceId;
+ /**
+ * 计划周期（每年、每月、每周）
+ */
+ @ApiModelProperty(value = "计划周期（每年、每月、每周）")
+ private String planCycleType;
+ /**
+ * 计划周期具体值，数组对象[1,2,3]
+ */
+ @ApiModelProperty(value = "计划周期具体值，数组对象[1,2,3]")
+ @TableField(typeHandler = FastjsonTypeHandler.class)
+ private List<String> planCycleValue;
+
+ @ApiModelProperty(value = "维护状态（0未维修1已维修）")
+ private Integer maintainStatus;
+
+ @ApiModelProperty(value = "最后维修时间")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastMaintainTime;
+
+ /**
+ * 区域编码
+ */
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3