From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Thu, 29 Jan 2026 10:09:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java | 6 +++--- 1 files changed, 3 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 d2aa7de..2a290f8 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 @@ -65,7 +65,7 @@ * @param status 设备状态 * @return */ - List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status); + List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack); /** @@ -80,7 +80,7 @@ * 设备类型统计 * @return */ - List<DeviceStatisticsVO> statisticalDeviceType(); + List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList); /** * 设备统计 - 按类型统计 @@ -104,7 +104,7 @@ * 设备报警统计 * @return */ - AlarmStatisticsVO statisticalDeviceAtt(); + AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList); /** * 驾驶舱获取设备列表 -- Gitblit v1.9.3