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/entity/FwDeviceEntity.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
index c3c3487..097d995 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceEntity.java
@@ -17,6 +17,7 @@
 package org.sxkj.fw.device.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +25,7 @@
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 设备表 实体类
@@ -42,6 +44,12 @@
 	 */
 	@ApiModelProperty(value = "设备sn")
 	private String deviceSn;
+
+	/**
+	 * 外部来源设备Id
+	 */
+	@ApiModelProperty(value = "外部来源设备Id")
+	private String airportId;
 
 	/**
 	 * 设备名称
@@ -134,9 +142,44 @@
 	@ApiModelProperty(value = "工作模式：侦测中/信号干扰中/诱导驱离中/待机")
 	private String workMode;
 	/**
+	 * 纬度
+	 */
+	@ApiModelProperty(value = "纬度")
+	private String latitude;
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String longitude;
+	/**
 	 * 区域编码
 	 */
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 
+	/**
+	 * 设备出入库状态 0未出库1已出库
+	 */
+	@ApiModelProperty(value = "设备出入库状态 0未出库1已出库")
+	private Integer trackStatus;
+
+	@ApiModelProperty(value = "最终出库区域（设备出库后的部署区域名称/编码）")
+	private String finalOutboundArea;
+
+	@ApiModelProperty(value = "是否启用：1启用 0禁用")
+	private Integer isEnabled;
+
+	/**
+	 * 使用日期
+	 */
+	@ApiModelProperty(value = "使用日期")
+	// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date useDate;
+
+	/**
+	 * 使用年限（单位：年）
+	 */
+	@ApiModelProperty(value = "使用年限（单位：年）")
+	private Integer serviceLife;
+
 }

--
Gitblit v1.9.3