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/entity/FwDroneAlarmRecordEntity.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
index 3866384..d4e0e17 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/entity/FwDroneAlarmRecordEntity.java
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -75,6 +76,7 @@
 	 */
 	@TableField("alarm_time")
 	@ApiModelProperty(value = "告警时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date alarmTime;
 	/**
 	 * 触发原因
@@ -119,16 +121,16 @@
 	@ApiModelProperty(value = "飞行速度(m/s)")
 	private BigDecimal flightSpeedMs;
 	/**
-	 * 停留时长 HH:MM:SS
+	 * 停留时长 (秒)
 	 */
 	@TableField("stay_duration")
-	@ApiModelProperty(value = "停留时长 HH:MM:SS")
-	private LocalTime stayDuration;
+	@ApiModelProperty(value = "停留时长(秒)")
+ 	private String stayDuration;
 	/**
 	 * 反制方式:信号干扰/诱导驱离/无
 	 */
 	@TableField("counter_way")
-	@ApiModelProperty(value = "反制方式:信号干扰/诱导驱离/无")
+	@ApiModelProperty(value = "反制方式:1.信号干扰/2.诱导驱离/无")
 	private String counterWay;
 	/**
 	 * 区域id ja_fw_area_divide
@@ -149,4 +151,24 @@
 	@ApiModelProperty(value = "区域编码")
 	private String areaCode;
 
+	/**
+	 * 设备类型(察打一体/便捷侦测箱/反制枪)
+	 */
+	@TableField("device_type")
+	@ApiModelProperty(value = "设备类型(察打一体/便捷侦测箱/反制枪)")
+	private String deviceType;
+
+	/**
+	 * 区域名称
+	 */
+	@TableField("area_name")
+	@ApiModelProperty(value = "区域名称")
+	private String areaName;
+	/**
+	 *  设备编号
+	 */
+	@TableField("device_sn")
+	@ApiModelProperty(value = "设备编号")
+	private String deviceSn;
+
 }

--
Gitblit v1.9.3