From 46b35a8bbb4767b2a28b03a88f705d18c9dbf426 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 14 Jan 2026 15:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 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 dd92e9b..ab30638 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,6 +22,7 @@
 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;
@@ -70,6 +71,24 @@
 	List<DeviceStatisticsVO> statisticalDeviceType();
 
 	/**
+	 * 设备统计 - 按类型统计
+	 * @return 统计数据
+	 */
+	List<DeviceTypeStatisticsVO> getDeviceTypeStatistics();
+
+	/**
+	 * 设备出库去向统计
+	 * @return 统计数据
+	 */
+	List<DeviceStatisticsVO> getDeviceOutStatistics();
+
+	/**
+	 * 设备生产厂商统计
+	 * @return 统计数据
+	 */
+	List<DeviceStatisticsVO> getDeviceManufacturerStatistics();
+
+	/**
 	 * 设备报警统计
 	 * @return
 	 */

--
Gitblit v1.9.3