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/record/entity/FwDroneAlarmRecordEntity.java | 140 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 137 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
index 5026c57..d4e0e17 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
@@ -17,18 +17,23 @@
package org.sxkj.fw.record.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import java.util.Date;
/**
* 无人机告警表 实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
@TableName("ja_fw_drone_alarm_record")
@@ -36,5 +41,134 @@
@EqualsAndHashCode(callSuper = true)
public class FwDroneAlarmRecordEntity extends BaseEntity {
+ /**
+ * 反无设备ID（关联ja_fw_device.id）
+ */
+ @TableField("device_id")
+ @ApiModelProperty(value = "反无设备ID（关联ja_fw_device.id）")
+ private Long deviceId;
+ /**
+ * 无人机名称
+ */
+ @TableField("drone_name")
+ @ApiModelProperty(value = "无人机名称")
+ private String droneName;
+ /**
+ * 无人机序列号
+ */
+ @TableField("drone_serial_no")
+ @ApiModelProperty(value = "无人机序列号")
+ private String droneSerialNo;
+ /**
+ * 无人机类型（微型机/植保机...）
+ */
+ @TableField("drone_type")
+ @ApiModelProperty(value = "无人机类型（微型机/植保机...）")
+ private String droneType;
+ /**
+ * 告警类型：实时告警/历史告警
+ */
+ @TableField("alarm_type")
+ @ApiModelProperty(value = "告警类型：实时告警/历史告警")
+ private String alarmType;
+ /**
+ * 告警时间
+ */
+ @TableField("alarm_time")
+ @ApiModelProperty(value = "告警时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date alarmTime;
+ /**
+ * 触发原因
+ */
+ @TableField("trigger_reason")
+ @ApiModelProperty(value = "触发原因")
+ private String triggerReason;
+ /**
+ * 飞行状态：侦测中/反制中
+ */
+ @TableField("flight_status")
+ @ApiModelProperty(value = "飞行状态：侦测中/反制中")
+ private String flightStatus;
+ /**
+ * 当前经度
+ */
+ @TableField("longitude")
+ @ApiModelProperty(value = "当前经度")
+ private Double longitude;
+ /**
+ * 当前纬度
+ */
+ @TableField("latitude")
+ @ApiModelProperty(value = "当前纬度")
+ private Double latitude;
+ /**
+ * 信号频段(MHz)
+ */
+ @TableField("signal_freq_mhz")
+ @ApiModelProperty(value = "信号频段(MHz)")
+ private Integer signalFreqMhz;
+ /**
+ * 飞行高度(m)
+ */
+ @TableField("flight_height_m")
+ @ApiModelProperty(value = "飞行高度(m)")
+ private Integer flightHeightM;
+ /**
+ * 飞行速度(m/s)
+ */
+ @TableField("flight_speed_ms")
+ @ApiModelProperty(value = "飞行速度(m/s)")
+ private BigDecimal flightSpeedMs;
+ /**
+ * 停留时长 （秒）
+ */
+ @TableField("stay_duration")
+ @ApiModelProperty(value = "停留时长（秒）")
+ private String stayDuration;
+ /**
+ * 反制方式：信号干扰/诱导驱离/无
+ */
+ @TableField("counter_way")
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
+ private String counterWay;
+ /**
+ * 区域id ja_fw_area_divide
+ */
+ @TableField("area_divide_id")
+ @ApiModelProperty(value = "区域id ja_fw_area_divide")
+ private String areaDivideId;
+ /**
+ * 场景id ja_fw_defense_scene.id
+ */
+ @TableField("defense_scene_id")
+ @ApiModelProperty(value = "场景id ja_fw_defense_scene.id")
+ private String defenseSceneId;
+ /**
+ * 区域编码
+ */
+ @TableField("area_code")
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
+
+ /**
+ * 设备类型（察打一体/便捷侦测箱/反制枪）
+ */
+ @TableField("device_type")
+ @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）")
+ private String deviceType;
+
+ /**
+ * 区域名称
+ */
+ @TableField("area_name")
+ @ApiModelProperty(value = "区域名称")
+ private String areaName;
+ /**
+ * 设备编号
+ */
+ @TableField("device_sn")
+ @ApiModelProperty(value = "设备编号")
+ private String deviceSn;
}
--
Gitblit v1.9.3