From 4db3d98e63dfb29173b5159d150b2936367e59da Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 16 Jan 2026 10:38:55 +0800
Subject: [PATCH] 设备列表返回状态相关及支持筛选

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
index deaabae..c0841e8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java
@@ -22,11 +22,13 @@
 import org.sxkj.fw.device.dto.FwDeviceDTO;
 import org.sxkj.fw.device.entity.FwDeviceEntity;
 import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
+import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
 import org.sxkj.fw.device.vo.FwDeviceVO;
 import org.sxkj.fw.device.excel.FwDeviceExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 设备表 服务类
@@ -47,11 +49,12 @@
 	/**
 	 * 列表查询
 	 *
-	 * @param isAreaSelect
-	 * @param areaId
+	 * @param isAreaSelect 是否过滤区域
+	 * @param areaId 设备被关联区域id
+	 * @param status 设备状态
 	 * @return
 	 */
-	List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId);
+	List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status);
 
 
 	/**
@@ -69,6 +72,24 @@
 	List<DeviceStatisticsVO> statisticalDeviceType();
 
 	/**
+	 * 设备统计 - 按类型统计
+	 * @return 统计数据
+	 */
+	List<DeviceTypeStatisticsVO> getDeviceTypeStatistics();
+
+	/**
+	 * 设备出库去向统计
+	 * @return 统计数据
+	 */
+	List<DeviceStatisticsVO> getDeviceOutStatistics();
+
+	/**
+	 * 设备生产厂商统计
+	 * @return 统计数据
+	 */
+	List<DeviceStatisticsVO> getDeviceManufacturerStatistics();
+
+	/**
 	 * 设备报警统计
 	 * @return
 	 */
@@ -81,4 +102,12 @@
 	 * @return
 	 */
 	IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice);
+
+	/**
+	 * 获取设备关联场景名称
+	 *
+	 * @param deviceIds
+	 * @return
+	 */
+	Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds);
 }

--
Gitblit v1.9.3