From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 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 a2bb79a..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;
 
 	/**
@@ -132,11 +136,25 @@
 	 */
 	@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