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/impl/FwDeviceServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index 8ec85e3..1d0636a 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -21,6 +21,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 org.sxkj.fw.device.mapper.FwDeviceMapper;
@@ -87,6 +88,25 @@
 	}
 
 	/**
+	 * 设备统计 - 按类型统计
+	 * @return 统计数据
+	 */
+	@Override
+	public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
+		return baseMapper.getDeviceTypeStatistics();
+	}
+
+	@Override
+	public List<DeviceStatisticsVO> getDeviceOutStatistics() {
+		return baseMapper.getDeviceOutStatistics();
+	}
+
+	@Override
+	public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
+		return baseMapper.getDeviceManufacturerStatistics();
+	}
+
+	/**
 	 * 设备属性统计
 	 * @return
 	 */

--
Gitblit v1.9.3