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/dto/FwDroneAlarmRecordDTO.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
index 9bc9545..c352cac 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneAlarmRecordDTO.java
@@ -25,6 +25,11 @@
 import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 
 /**
  * 无人机告警表 数据传输对象实体类
@@ -33,10 +38,11 @@
  * @since 2026-01-08
  */
 @Data
-public class FwDroneAlarmRecordDTO {
+public class FwDroneAlarmRecordDTO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty("主键id")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 	/**
 	 * 反无设备ID(关联ja_fw_device.id)
@@ -141,4 +147,22 @@
 
 	@ApiModelProperty(value = "区域名称")
 	private String areaName;
+
+	@ApiModelProperty(value = "当前用户id")
+	private Long currentUserId;
+
+	@ApiModelProperty(value = "部门集合",hidden = true)
+	private List<Long> deptList;
+
+	@ApiModelProperty(value = "共享设备编号集合",hidden = true)
+	private List<Long> sharedDeviceIdList;
+	// 当前用户部门ID
+	@ApiModelProperty(value = "当前用户部门ID",hidden = true)
+	private String currentDeptId;
+
+	@ApiModelProperty(value = "regionName",hidden = true)
+	private String regionName;
+
+	@ApiModelProperty(value = "regionCode",hidden = true)
+	private String regionCode;
 }

--
Gitblit v1.9.3