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/dto/FwDeviceDTO.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 8ed7243..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;
@@ -143,13 +146,6 @@
@ApiModelProperty(value = "经度")
private String longitude;
- @ApiModelProperty(value = "部门集合",hidden = true)
- private List<Long> deptList;
- // 当前用户部门id
- @ApiModelProperty(value = "部门id",hidden = true)
- private String currentDeptId;
-
-
/**
* 创建人
*/
@@ -180,8 +176,28 @@
*/
@ApiModelProperty(value = "删除标志（0存在 1删除）")
private Integer isDeleted;
- // setRegionName
- @ApiModelProperty(value = "区域名称")
- private String regionName;
+ // 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