From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
index 96f79ff..906b257 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceDTO.java
@@ -17,14 +17,17 @@
package org.sxkj.fw.device.dto;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotEmpty;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.sxkj.fw.common.FwBaseInfo;
/**
* 设备表 数据传输对象实体类
@@ -33,7 +36,7 @@
* @since 2026-01-08
*/
@Data
-public class FwDeviceDTO implements Serializable {
+public class FwDeviceDTO extends FwBaseInfo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -116,6 +119,12 @@
private int effectiveRangeKmIsNotNull ;
/**
+ * 是否出库
+ */
+ @ApiModelProperty(value = "是否出库 0不过滤 1是 2否")
+ private int isTrack;
+
+ /**
* 设备状态，多个状态用逗号隔
*/
@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
@@ -136,11 +145,6 @@
*/
@ApiModelProperty(value = "经度")
private String longitude;
-
-
-
-
-
/**
* 创建人
@@ -172,4 +176,28 @@
*/
@ApiModelProperty(value = "删除标志（0存在 1删除）")
private Integer isDeleted;
+ // flyTime
+ @ApiModelProperty(value = " flyTime")
+ private Date flyTime;
+
+ /**
+ * 使用日期
+ */
+ @ApiModelProperty(value = "使用日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date useDate;
+
+ /**
+ * 使用年限（单位：年）
+ */
+ @ApiModelProperty(value = "使用年限（单位：年）")
+ private Integer serviceLife;
+ // isEnabled
+ @ApiModelProperty(value = "是否启用")
+ private Integer isEnabled;
+
+ // track_status
+ @ApiModelProperty(value = "出库状态")
+ private Integer trackStatus;
+
}
--
Gitblit v1.9.3