From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java | 149 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 142 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
index ead5a50..74a8e8f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
@@ -16,20 +16,155 @@
*/
package org.sxkj.fw.device.vo;
-import org.sxkj.fw.device.entity.FwDeviceMaintainPlanEntity;
-import org.springblade.core.tool.node.INode;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.sxkj.system.cache.SysCache;
+import java.io.Serializable;
+import java.util.List;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 设备维护计划表 视图实体类
*
- * @author lw
- * @since 2026-01-07
+ * @author Aix
+ * @since 2026-01-09
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceMaintainPlanVO extends FwDeviceMaintainPlanEntity {
+public class FwDeviceMaintainPlanVO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 设备ID
+ */
+ @ApiModelProperty(value = "设备ID")
+ private Long deviceId;
+ /**
+ * 计划周期（每年、每月、每周）
+ */
+ @ApiModelProperty(value = "计划周期（每年、每月、每周）")
+ 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 String deviceAtt;
+
+ /**
+ * 设备型号
+ */
+ @ApiModelProperty(value = "设备型号")
+ private String deviceModel;
+
+ /**
+ * 所属部门
+ */
+ @ApiModelProperty(value = "所属部门")
+ private Long belongDept;
+
+ /**
+ * 设备规格
+ */
+ @ApiModelProperty(value = "设备规格")
+ private String deviceSpecification;
+
+ /**
+ * 生产厂商
+ */
+ @ApiModelProperty(value = "生产厂商")
+ private String manufacturer;
+
+ /**
+ * 来源
+ */
+ @ApiModelProperty(value = "来源")
+ private String source;
+
+ /**
+ * 用途
+ */
+ @ApiModelProperty(value = "用途")
+ private String purpose;
+
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String charger;
+
+ @ApiModelProperty("入库时间")
+ private Date createTime;
+
+ @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 = "所属部门名称")
+ public String getBelongDeptName() {
+ if (belongDept == null) {
+ return null;
+ }
+ return SysCache.getDeptName(belongDept);
+ }
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 状态（0正常 1停用）
+ */
+ @ApiModelProperty(value = "状态（0正常 1停用）")
+ private Integer status;
}
--
Gitblit v1.9.3