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/mapper/FwDeviceMapper.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 75fcb63..030c987 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
@@ -24,6 +24,7 @@
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
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.excel.FwDeviceExcel;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
@@ -55,7 +56,15 @@
* @return
*/
List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
- @Param("status") Integer status, @Param("isTrack") Integer isTrack);
+ @Param("status") Integer status, @Param("isTrack") Integer isTrack);
+
+ /**
+ * 根据多边形查询设备列表
+ *
+ * @param query 查询条件
+ * @return 设备列表
+ */
+ List<FwDeviceEntity> selectFwDeviceListByPolygons(@Param("query") FwDevicePolygonQueryDTO query);
/**
@@ -69,7 +78,7 @@
* 设备统计 - 驾驶舱使用
* @return 统计数据
*/
- List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList);
+ List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList, String currentDeptId);
/**
* 设备统计 - 按类型统计
@@ -93,7 +102,7 @@
* 告警统计
* @return
*/
- AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList);
+ AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId);
/**
* 获取设备列表
--
Gitblit v1.9.3