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/dto/FwDroneAlarmRecordDTO.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 91c51e2..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）
@@ -56,12 +62,12 @@
/**
* 无人机类型（微型机/植保机...）
*/
- @ApiModelProperty(value = "无人机类型（微型机/植保机...）")
+ @ApiModelProperty(value = "无人机类型（1.微型机/2.植保机...）")
private String droneType;
/**
* 告警类型：实时告警/历史告警
*/
- @ApiModelProperty(value = "告警类型：实时告警/历史告警")
+ @ApiModelProperty(value = "告警类型：1.实时告警/2.历史告警")
private String alarmType;
/**
* 告警时间
@@ -77,7 +83,7 @@
/**
* 飞行状态：侦测中/反制中
*/
- @ApiModelProperty(value = "飞行状态：侦测中/反制中")
+ @ApiModelProperty(value = "飞行状态：1.侦测中/2.反制中")
private String flightStatus;
/**
* 当前经度
@@ -112,7 +118,7 @@
/**
* 反制方式：信号干扰/诱导驱离/无
*/
- @ApiModelProperty(value = "反制方式：信号干扰/诱导驱离/无")
+ @ApiModelProperty(value = "反制方式：1.信号干扰/2.诱导驱离/无")
private String counterWay;
/**
* 区域id ja_fw_area_divide
@@ -129,4 +135,34 @@
*/
@ApiModelProperty(value = "区域编码")
private String areaCode;
+
+ @ApiModelProperty(value = "开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "设备类型")
+ private String deviceType;
+
+ @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