From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 14 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 c73df0e..32cac3b 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
@@ -16,17 +16,21 @@
*/
package org.sxkj.fw.device.mapper;
-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.entity.FwDeviceEntity;
-import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
-import org.sxkj.fw.device.vo.FwDeviceVO;
-import org.sxkj.fw.device.excel.FwDeviceExcel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
+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.Date;
import java.util.List;
/**
@@ -50,30 +54,58 @@
* 列表查询
*
* @param isAreaSelect
+ * @param areaId
+ * @param areaIds
* @return
*/
- List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect);
+ 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);
/**
* 获取导出数据
- *
* @param queryWrapper
* @return
*/
List<FwDeviceExcel> exportFwDevice(@Param("ew") Wrapper<FwDeviceEntity> queryWrapper);
/**
- * 设备统计
- * @return
+ * 设备统计 - 驾驶舱使用
+ * @return 统计数据
*/
- List<DeviceStatisticsVO> statisticalDeviceType();
+ List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId, Date flyTime);
+
+ /**
+ * 设备统计 - 按类型统计
+ * @return 统计数据
+ */
+ List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList,String currentDeptId);
+
+ /**
+ * 设备出库去向统计
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList,String currentDeptId);
+
+ /**
+ * 设备生产厂商统计
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList, String currentDeptId);
/**
* 告警统计
* @return
*/
- AlarmStatisticsVO statisticalDeviceAtt();
+ AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId, Date flyTime);
/**
* 获取设备列表
@@ -82,4 +114,37 @@
* @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);
+
+ /**
+ * 批量更新设备启用状态
+ *
+ * @param deviceIds 设备ID列表
+ * @param isEnabled 启用状态：0-禁用，1-启用
+ * @return 影响行数
+ */
+ int batchUpdateIsEnabled(@Param("deviceIds") List<Long> deviceIds, @Param("isEnabled") Integer isEnabled);
}
--
Gitblit v1.9.3