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/detection/entity/FwEffectEvalEntity.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
index c721204..89cf90c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwEffectEvalEntity.java
@@ -17,23 +17,126 @@
package org.sxkj.fw.detection.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
/**
* 反制效果评估表 实体类
*
* @author BladeX
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
@TableName("ja_fw_effect_eval")
@ApiModel(value = "FwEffectEval对象", description = "反制效果评估表")
@EqualsAndHashCode(callSuper = true)
-public class FwEffectEvalEntity extends TenantEntity {
+public class FwEffectEvalEntity extends BaseEntity {
+ /**
+ * 告警记录ID（ja_fw_drone_alarm_record.id）
+ */
+ @TableField("alarm_record_id")
+ @ApiModelProperty(value = "告警记录ID（ja_fw_drone_alarm_record.id）")
+ private Long alarmRecordId;
+
+ @TableField("counter_way")
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
+ private String counterWay;
+ /**
+ * 反制设备ID（ja_fw_device.id）
+ */
+ @TableField("device_id")
+ @ApiModelProperty(value = "反制设备ID（ja_fw_device.id）")
+ private Long deviceId;
+ /**
+ * 反制设备编码（快照）
+ */
+ @TableField("device_sn")
+ @ApiModelProperty(value = "反制设备编码（快照）")
+ private String deviceSn;
+ /**
+ * 反制设备名称（快照）
+ */
+ @TableField("device_name")
+ @ApiModelProperty(value = "反制设备名称（快照）")
+ private String deviceName;
+ /**
+ * 反制设备型号（快照）
+ */
+ @TableField("device_model")
+ @ApiModelProperty(value = "反制设备型号（快照）")
+ private String deviceModel;
+ /**
+ * 反制设备类型（快照）
+ */
+ @TableField("device_type")
+ @ApiModelProperty(value = "反制设备类型（快照）")
+ private String deviceType;
+ /**
+ * 无人机名称
+ */
+ @TableField("drone_name")
+ @ApiModelProperty(value = "无人机名称")
+ private String droneName;
+ /**
+ * 无人机类型
+ */
+ @TableField("drone_type")
+ @ApiModelProperty(value = "无人机类型")
+ private String droneType;
+ /**
+ * 无人机设备编码
+ */
+ @TableField("drone_device_code")
+ @ApiModelProperty(value = "无人机设备编码")
+ private String droneDeviceCode;
+ /**
+ * 发现时间
+ */
+ @TableField("find_time")
+ @ApiModelProperty(value = "发现时间")
+ private Date findTime;
+ /**
+ * 反制效果（success/fail）
+ */
+ @TableField("counter_effect")
+ @ApiModelProperty(value = "反制效果（1.success/2.fail）")
+ private String counterEffect;
+ /**
+ * 部署经度（冗余）
+ */
+ @TableField("deploy_longitude")
+ @ApiModelProperty(value = "部署经度（冗余）")
+ private Double deployLongitude;
+ /**
+ * 部署纬度（冗余）
+ */
+ @TableField("deploy_latitude")
+ @ApiModelProperty(value = "部署纬度（冗余）")
+ private Double deployLatitude;
+ /**
+ * 覆盖范围（米）
+ */
+ @TableField("cover_radius_m")
+ @ApiModelProperty(value = "覆盖范围（米）")
+ private Integer coverRadiusM;
+ /**
+ * 工作模式（机动/固定）
+ */
+ @TableField("work_mode")
+ @ApiModelProperty(value = "工作模式（1.机动/2.固定）")
+ private String workMode;
+ /**
+ * 区域编码
+ */
+ @TableField("area_code")
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3