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 | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 a41333c..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
@@ -30,6 +30,7 @@
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
+import java.util.Date;
import java.util.List;
/**
@@ -54,10 +55,11 @@
*
* @param isAreaSelect
* @param areaId
+ * @param areaIds
* @return
*/
List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
- @Param("status") Integer status, @Param("isTrack") Integer isTrack);
+ @Param("areaIds") List<Long> areaIds, @Param("status") Integer status, @Param("isTrack") Integer isTrack);
/**
* 根据多边形查询设备列表
@@ -79,7 +81,7 @@
* 设备统计 - 驾驶舱使用
* @return 统计数据
*/
- List<DeviceStatisticsVO> statisticalDeviceType(String regionName, String currentDeptId);
+ List<DeviceStatisticsVO> statisticalDeviceType(String regionCode, String currentDeptId, Date flyTime);
/**
* 设备统计 - 按类型统计
@@ -97,13 +99,13 @@
* 设备生产厂商统计
* @return 统计数据
*/
- List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList);
+ List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList, String currentDeptId);
/**
* 告警统计
* @return
*/
- AlarmStatisticsVO statisticalDeviceAtt(String regionName, String currentDeptId);
+ AlarmStatisticsVO statisticalDeviceAtt(String regionCode, String currentDeptId, Date flyTime);
/**
* 获取设备列表
@@ -120,7 +122,7 @@
* @param trackStatus 出入库状态
* @return 影响行数
*/
- int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus, @Param("outTarget") String outTarget);
+ int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus, @Param("outTarget") String outTarget, @Param("outTargetCode") String outTargetCode);
/**
* 查询非本部门区域的设备
@@ -129,4 +131,20 @@
* @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