From 54898304203f3ea0c132899dca4341dc182d13de Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Wed, 28 Jan 2026 17:20:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java index 1e71c87..75fcb63 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java @@ -69,31 +69,31 @@ * 设备统计 - 驾驶舱使用 * @return 统计数据 */ - List<DeviceStatisticsVO> statisticalDeviceType(); + List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList); /** * 设备统计 - 按类型统计 * @return 统计数据 */ - List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(); + List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList); /** * 设备出库去向统计 * @return 统计数据 */ - List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull); + List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList); /** * 设备生产厂商统计 * @return 统计数据 */ - List<DeviceStatisticsVO> getDeviceManufacturerStatistics(); + List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList); /** * 告警统计 * @return */ - AlarmStatisticsVO statisticalDeviceAtt(); + AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList); /** * 获取设备列表 -- Gitblit v1.9.3