From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java
index d3716a1..3181993 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java
@@ -26,6 +26,9 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.io.Serializable;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
/**
* 无人机告警表 视图实体类
@@ -34,10 +37,11 @@
* @since 2026-01-08
*/
@Data
-public class FwDroneAlarmRecordVO {
+public class FwDroneAlarmRecordVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -58,12 +62,12 @@
/**
* 无人机类型（微型机/植保机...）
*/
- @ApiModelProperty(value = "无人机类型（微型机/植保机...）")
+ @ApiModelProperty(value = "无人机类型（1.微型机/2.植保机...）")
private String droneType;
/**
* 告警类型：实时告警/历史告警
*/
- @ApiModelProperty(value = "告警类型：实时告警/历史告警")
+ @ApiModelProperty(value = "告警类型：1.实时告警/2.历史告警")
private String alarmType;
/**
* 告警时间
@@ -79,7 +83,7 @@
/**
* 飞行状态：侦测中/反制中
*/
- @ApiModelProperty(value = "飞行状态：侦测中/反制中")
+ @ApiModelProperty(value = "飞行状态：1.侦测中/2.反制中")
private String flightStatus;
/**
* 当前经度
@@ -114,7 +118,7 @@
/**
* 反制方式：信号干扰/诱导驱离/无
*/
- @ApiModelProperty(value = "反制方式：信号干扰/诱导驱离/无")
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/3.无")
private String counterWay;
/**
* 区域名称
@@ -130,13 +134,27 @@
/**
* 设备类型（察打一体/便捷侦测箱/反制枪）
*/
- @ApiModelProperty(value = "设备类型（察打一体/便捷侦测箱/反制枪）")
+ @ApiModelProperty(value = "设备类型（1.便捷侦测箱/2.反制枪/3.察打一体）")
private String deviceType;
-
-
+ /**
+ * 设备名称
+ */
@ApiModelProperty(value = "设备名称")
private String deviceName;
- @ApiModelProperty(value = "设备型号")
- private String deviceModel;
+ /**
+ * 设备编号
+ */
+ @ApiModelProperty(value = "设备编号")
+ private String deviceSn;
+
+ /**
+ * 设备状态
+ */
+ @ApiModelProperty(value = "设备状态（0:在线/1:离线/2:故障/3:报废）")
+ private String deviceStatus;
+
+ // favorited
+ @ApiModelProperty(value = "是否关注 0 未关注 1 已关注 ")
+ private Integer favorited;
}
--
Gitblit v1.9.3