From 970567fcffdb6710288357a0d18fb66bc29d074e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:17:57 +0800
Subject: [PATCH] 设备统计优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 fc0bd50..a41333c 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,9 +24,11 @@
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;
+import org.sxkj.fw.device.vo.FwDeviceVO;
import java.util.List;
@@ -55,7 +57,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,19 +79,19 @@
* 设备统计 - 驾驶舱使用
* @return 统计数据
*/
- List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList, String currentDeptId);
+ List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId);
/**
* 设备统计 - 按类型统计
* @return 统计数据
*/
- List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList);
+ List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList,String currentDeptId);
/**
* 设备出库去向统计
* @return 统计数据
*/
- List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList);
+ List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList,String currentDeptId);
/**
* 设备生产厂商统计
@@ -93,7 +103,7 @@
* 告警统计
* @return
*/
- AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList, String currentDeptId);
+ AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId);
/**
* 获取设备列表
@@ -110,5 +120,13 @@
* @param trackStatus 出入库状态
* @return 影响行数
*/
- int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus);
+ int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus, @Param("outTarget") String outTarget);
+
+ /**
+ * 查询非本部门区域的设备
+ * @param regionName 部门名称
+ * @param currentDeptId 当前用户部门ID
+ * @return 设备列表
+ */
+ List<FwDeviceVO> selectNonDeptAreaDevices(@Param("regionName") String regionName, @Param("currentDeptId") String currentDeptId);
}
--
Gitblit v1.9.3