From bf45f88ff9ea1ea1d4976f97dbe2a12eae9a52f9 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Feb 2026 10:12:37 +0800
Subject: [PATCH] 反无优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 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 d69f38f..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
@@ -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;
@@ -52,9 +54,19 @@
*
* @param isAreaSelect
* @param areaId
+ * @param areaIds
* @return
*/
- List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId);
+ List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
+ @Param("areaIds") List<Long> areaIds, @Param("status") Integer status, @Param("isTrack") Integer isTrack);
+
+ /**
+ * 根据多边形查询设备列表
+ *
+ * @param query 查询条件
+ * @return 设备列表
+ */
+ List<FwDeviceEntity> selectFwDeviceListByPolygons(@Param("query") FwDevicePolygonQueryDTO query);
/**
@@ -68,31 +80,31 @@
* 设备统计 - 驾驶舱使用
* @return 统计数据
*/
- List<DeviceStatisticsVO> statisticalDeviceType();
+ List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId);
/**
* 设备统计 - 按类型统计
* @return 统计数据
*/
- List<DeviceTypeStatisticsVO> getDeviceTypeStatistics();
+ List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList,String currentDeptId);
/**
* 设备出库去向统计
* @return 统计数据
*/
- List<DeviceStatisticsVO> getDeviceOutStatistics();
+ List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList,String currentDeptId);
/**
* 设备生产厂商统计
* @return 统计数据
*/
- List<DeviceStatisticsVO> getDeviceManufacturerStatistics();
+ List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList, String currentDeptId);
/**
* 告警统计
* @return
*/
- AlarmStatisticsVO statisticalDeviceAtt();
+ AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId);
/**
* 获取设备列表
@@ -101,4 +113,28 @@
* @return
*/
List<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice);
+
+ /**
+ * 按设备ID更新出入库状态
+ *
+ * @param deviceId 设备ID
+ * @param trackStatus 出入库状态
+ * @return 影响行数
+ */
+ int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus, @Param("outTarget") String outTarget, @Param("outTargetCode") String outTargetCode);
+
+ /**
+ * 查询非本部门区域的设备
+ * @param regionName 部门名称
+ * @param currentDeptId 当前用户部门ID
+ * @return 设备列表
+ */
+ List<FwDeviceVO> selectNonDeptAreaDevices(@Param("regionName") String regionName, @Param("currentDeptId") String currentDeptId);
+
+ /**
+ *
+ * @param fwDeviceDTO
+ * @return
+ */
+ List<DeviceStatisticsVO> getDeviceStatistics(FwDeviceDTO fwDeviceDTO);
}
--
Gitblit v1.9.3