From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 13fb2f1..4a955dc 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
@@ -54,10 +54,11 @@
*
* @param isAreaSelect
* @param areaId
+ * @param areaIds
* @return
*/
List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
- @Param("status") Integer status, @Param("isTrack") Integer isTrack);
+ @Param("areaIds") List<Long> areaIds, @Param("status") Integer status, @Param("isTrack") Integer isTrack);
/**
* 根据多边形查询设备列表
@@ -97,7 +98,7 @@
* 设备生产厂商统计
* @return 统计数据
*/
- List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList);
+ List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList, String currentDeptId);
/**
* 告警统计
--
Gitblit v1.9.3