From e4f4ca3ca6089b4e707141c9984d2610a44c5173 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 16 Jul 2026 17:14:32 +0800
Subject: [PATCH] fix(device): 修复设备查询条件错误

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
index 227f476..4ac93ad 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/FwDevicePageParam.java
@@ -3,6 +3,9 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Description 创建设备分页查询参数类
  * @Author AIX
@@ -33,5 +36,36 @@
 	 * 有效范围是否为空：0-不处理 1-不为空 2-为空
 	 */
 	@ApiModelProperty(value = "有效范围是否为空：0-不处理 1-不为空 2-为空")
-	private Integer effectiveRangeKmIsNotNull;
+	private int effectiveRangeKmIsNotNull;
+
+	/**
+	 * 是否出库
+	 */
+	@ApiModelProperty(value = "是否出库 0不过滤 1是 2否")
+	private int isTrack;
+
+	/**
+	 * 运行状态（0:在线/1:离线/2:故障/3:报废）
+	 */
+	@ApiModelProperty(value = "运行状态（0:在线/1:离线/2:故障/3:报废）")
+	private Integer status;
+
+	/**
+	 * 设备状态，多个状态用逗号隔
+	 */
+	@ApiModelProperty(value = "设备状态，多个状态用逗号隔开")
+	private List<String> deviceStatusList;
+
+	/**
+	 * 使用日期
+	 */
+	@ApiModelProperty(value = "使用日期")
+	private Date useDate;
+
+	/**
+	 * 使用年限（单位：年）
+	 */
+	@ApiModelProperty(value = "使用年限（单位：年）")
+	private Integer serviceLife;
+
 }

--
Gitblit v1.9.3