From 5b23a8cb9294506d88330f0750f39b9a2cbabbdc Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Thu, 29 Jan 2026 18:06:19 +0800 Subject: [PATCH] 区域划分调整 --- drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 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 2a290f8..421a970 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 @@ -20,6 +20,7 @@ import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO; import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO; import org.sxkj.fw.device.dto.FwDeviceDTO; +import org.sxkj.fw.device.dto.FwDevicePolygonQueryDTO; import org.sxkj.fw.device.entity.FwDeviceEntity; import org.sxkj.fw.device.param.FwDevicePageParam; import org.sxkj.fw.device.vo.CockpitFwDeviceVO; @@ -67,6 +68,14 @@ */ List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack); + /** + * 根据多边形查询设备列表 + * + * @param query 查询条件 + * @return 设备列表 + */ + List<FwDeviceEntity> selectFwDeviceListByPolygons(FwDevicePolygonQueryDTO query); + /** * 导出数据 @@ -80,7 +89,7 @@ * 设备类型统计 * @return */ - List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList); + List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList, String currentDeptId); /** * 设备统计 - 按类型统计 @@ -104,7 +113,7 @@ * 设备报警统计 * @return */ - AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList); + AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId); /** * 驾驶舱获取设备列表 -- Gitblit v1.9.3