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 | 134 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 122 insertions(+), 12 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 f3f4746..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,24 +17,39 @@
package org.sxkj.fw.device.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
- * 反无设备表 实体类
+ * 设备表 实体类
*
- * @author AIX
- * @since 2026-01-06
+ * @author aix
+ * @since 2026-01-08
*/
@Data
@TableName("ja_fw_device")
-@ApiModel(value = "FwDevice对象", description = "反无设备表")
+@ApiModel(value = "FwDevice对象", description = "设备表")
@EqualsAndHashCode(callSuper = true)
-public class FwDeviceEntity extends TenantEntity {
+public class FwDeviceEntity extends BaseEntity {
+
+ /**
+ * 设备sn
+ */
+ @ApiModelProperty(value = "设备sn")
+ private String deviceSn;
+
+ /**
+ * 外部来源设备Id
+ */
+ @ApiModelProperty(value = "外部来源设备Id")
+ private String airportId;
/**
* 设备名称
@@ -42,14 +57,19 @@
@ApiModelProperty(value = "设备名称")
private String deviceName;
/**
- * 设备类型
+ * 设备类型（察打一体/便捷侦测箱/反制枪）
*/
- @ApiModelProperty(value = "设备类型")
+ @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）")
private String deviceType;
/**
- * 设备型号
+ * 设备属性（无线电/光电/雷达）
*/
- @ApiModelProperty(value = "设备型号")
+ @ApiModelProperty(value = "设备属性（无线电/光电/雷达）")
+ private String deviceAtt;
+ /**
+ * 型号
+ */
+ @ApiModelProperty(value = "型号")
private String deviceModel;
/**
* 规格
@@ -67,9 +87,99 @@
@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;
+ /**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
+ /**
+ * 电量百分比 0-100
+ */
+ @ApiModelProperty(value = "电量百分比 0-100")
+ private Byte batteryPct;
+ /**
+ * 方位角 0-360°
+ */
+ @ApiModelProperty(value = "方位角 0-360°")
+ private Short azimuth;
+ /**
+ * 俯仰角 -90-+90°
+ */
+ @ApiModelProperty(value = "俯仰角 -90-+90°")
+ private Short elevation;
+ /**
+ * 侦测目标数量
+ */
+ @ApiModelProperty(value = "侦测目标数量")
+ private Integer detectTargetCnt;
+ /**
+ * 有效范围 km
+ */
+ @ApiModelProperty(value = "有效范围 km")
+ private BigDecimal effectiveRangeKm;
+ /**
+ * 工作模式：侦测中/信号干扰中/诱导驱离中/待机
+ */
+ @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