From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Mon, 02 Feb 2026 18:18:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java index f1e343e..d9e4712 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/IFwDroneAlarmRecordService.java @@ -20,6 +20,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.metadata.IPage; @@ -46,14 +47,14 @@ /** * 导出数据 * - * @param queryWrapper + * @param fwDroneAlarmRecord * @return */ - List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord(Wrapper<FwDroneAlarmRecordEntity> queryWrapper); + List<FwDroneAlarmRecordExcel> exportFwDroneAlarmRecord(FwDroneAlarmRecordExportParam fwDroneAlarmRecord); /** * * @return */ - AlarmStatisticsVO alarmTypeStatistics(); + AlarmStatisticsVO alarmTypeStatistics(String regionName, String currentDeptId); } -- Gitblit v1.9.3