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 | 183 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 176 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 b28b3e2..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
@@ -16,19 +16,188 @@
*/
package org.sxkj.fw.device.dto;
-import org.sxkj.fw.device.entity.FwDeviceEntity;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+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;
/**
- * 反无设备表 数据传输对象实体类
+ * 设备表 数据传输对象实体类
*
- * @author AIX
- * @since 2026-01-06
+ * @author aix
+ * @since 2026-01-08
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class FwDeviceDTO extends FwDeviceEntity {
+public class FwDeviceDTO extends FwBaseInfo implements Serializable {
+
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
+
+ /**
+ * 设备sn
+ */
+ @ApiModelProperty(value = "设备sn")
+ private String deviceSn;
+
+ /**
+ * 设备名称
+ */
+ @ApiModelProperty(value = "设备名称", required = true)
+ private String deviceName;
+ /**
+ * 设备类型（察打一体/便捷侦测箱/反制枪）
+ */
+ @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）")
+ private String deviceType;
+ /**
+ * 设备属性（无线电/光电/雷达）
+ */
+ @ApiModelProperty(value = "设备属性（无线电/光电/雷达）")
+ private String deviceAtt;
+ /**
+ * 型号
+ */
+ @ApiModelProperty(value = "型号")
+ private String deviceModel;
+ /**
+ * 规格
+ */
+ @ApiModelProperty(value = "规格")
+ private String deviceSpecification;
+ /**
+ * 生产厂商
+ */
+ @ApiModelProperty(value = "生产厂商")
+ private String manufacturer;
+ /**
+ * 来源
+ */
+ @ApiModelProperty(value = "来源")
+ private String source;
+ /**
+ * 用途
+ */
+ @ApiModelProperty(value = "用途")
+ private String purpose;
+ /**
+ * 所属部门
+ */
+ @ApiModelProperty(value = "所属部门")
+ private Long belongDept;
+ /**
+ * 负责人
+ */
+ @ApiModelProperty(value = "负责人")
+ private String charger;
+ /**
+ * 联系电话
+ */
+ @ApiModelProperty(value = "联系电话")
+ private String contactPhone;
+
+ /**
+ * 有效范围 km
+ */
+ @ApiModelProperty(value = "有效范围 km")
+ private BigDecimal effectiveRangeKm;
+
+ /**
+ * 有效范围 km
+ */
+ @ApiModelProperty(value = "是否有范围 0不过滤 1有 2没有")
+ private int effectiveRangeKmIsNotNull ;
+
+ /**
+ * 是否出库
+ */
+ @ApiModelProperty(value = "是否出库 0不过滤 1是 2否")
+ private int isTrack;
+
+ /**
+ * 设备状态，多个状态用逗号隔
+ */
+ @ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
+ private List<String> deviceStatusList;
+
+ /**
+ * 运行状态（0:在线/1:离线/2:故障/3:报废）
+ */
+ @ApiModelProperty(value = "运行状态（0:在线/1:离线/2:故障/3:报废）")
+ private Integer status;
+ /**
+ * 纬度
+ */
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+ /**
+ * 经度
+ */
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ /**
+ * 创建人
+ */
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+ /**
+ * 创建部门
+ */
+ @ApiModelProperty(value = "创建部门")
+ private Long createDept;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人")
+ private Long updateUser;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+ /**
+ * 删除标志（0存在 1删除）
+ */
+ @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