From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/vo/FwDroneAlarmRecordVO.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 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..a94dcc9 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
@@ -58,12 +58,12 @@
 	/**
 	 * 无人机类型(微型机/植保机...)
 	 */
-	@ApiModelProperty(value = "无人机类型(微型机/植保机...)")
+	@ApiModelProperty(value = "无人机类型(1.微型机/2.植保机...)")
 	private String droneType;
 	/**
 	 * 告警类型:实时告警/历史告警
 	 */
-	@ApiModelProperty(value = "告警类型:实时告警/历史告警")
+	@ApiModelProperty(value = "告警类型:1.实时告警/2.历史告警")
 	private String alarmType;
 	/**
 	 * 告警时间
@@ -79,7 +79,7 @@
 	/**
 	 * 飞行状态:侦测中/反制中
 	 */
-	@ApiModelProperty(value = "飞行状态:侦测中/反制中")
+	@ApiModelProperty(value = "飞行状态:1.侦测中/2.反制中")
 	private String flightStatus;
 	/**
 	 * 当前经度
@@ -114,7 +114,7 @@
 	/**
 	 * 反制方式:信号干扰/诱导驱离/无
 	 */
-	@ApiModelProperty(value = "反制方式:信号干扰/诱导驱离/无")
+	@ApiModelProperty(value = "反制方式:1.信号干扰/2.诱导驱离/3.无")
 	private String counterWay;
 	/**
 	 * 区域名称
@@ -130,13 +130,23 @@
 	/**
 	 * 设备类型(察打一体/便捷侦测箱/反制枪)
 	 */
-	@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;
 }

--
Gitblit v1.9.3