From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java
index d77d837..a2c7dd4 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.java
@@ -19,6 +19,7 @@
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
+import org.sxkj.fw.record.param.FwDroneAlarmRecordExportParam;
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
import org.sxkj.fw.record.excel.FwDroneAlarmRecordExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -48,14 +49,14 @@
/**
* 获取导出数据
*
- * @param queryWrapper
+ * @param fwDroneAlarmRecord
* @return
*/
- List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord(@Param("ew") Wrapper<FwDroneAlarmRecordEntity> queryWrapper);
+ List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord( FwDroneAlarmRecordExportParam fwDroneAlarmRecord);
/**
* 告警类型统计
* @return
*/
- AlarmStatisticsVO alarmTypeStatistics();
+ AlarmStatisticsVO alarmTypeStatistics(List<Long> deptList);
}
--
Gitblit v1.9.3