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/entity/FwDeviceMaintainPlanEntity.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 5e24400..e521e73 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,24 +16,25 @@
*/
package org.sxkj.fw.device.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
-import java.time.LocalDate;
+import java.util.List;
/**
* 设备维护计划表 实体类
*
- * @author lw
- * @since 2026-01-08
+ * @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 {
@@ -41,25 +42,22 @@
/**
* 设备ID
*/
- @TableField("device_id")
@ApiModelProperty(value = "设备ID")
private Long deviceId;
/**
- * 计划周期（每月1日/每季1日等）
+ * 计划周期（每年、每月、每周）
*/
- @TableField("plan_cycle")
- @ApiModelProperty(value = "计划周期（每月1日/每季1日等）")
- private String planCycle;
+ @ApiModelProperty(value = "计划周期（每年、每月、每周）")
+ private String planCycleType;
/**
- * 计划日期（YYYY-MM-DD）
+ * 计划周期具体值，数组对象[1,2,3]
*/
- @TableField("plan_time")
- @ApiModelProperty(value = "计划日期（YYYY-MM-DD）")
- private LocalDate planTime;
+ @ApiModelProperty(value = "计划周期具体值，数组对象[1,2,3]")
+ @TableField(typeHandler = FastjsonTypeHandler.class)
+ private List<String> planCycleValue;
/**
* 区域编码
*/
- @TableField("area_code")
@ApiModelProperty(value = "区域编码")
private String areaCode;
--
Gitblit v1.9.3