From 33ab5566da759239cdde4e80464ee293e4154fc3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 10:44:01 +0800
Subject: [PATCH] 数据驾驶舱

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java
index 508d8e6..3d78873 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java
@@ -95,7 +95,7 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入fwDroneAlarmRecord")
-	public R<IPage<FwDroneAlarmRecordVO>> page(FwDroneAlarmRecordVO fwDroneAlarmRecord, Query query) {
+	public R<IPage<FwDroneAlarmRecordVO>> page(FwDroneAlarmRecordDTO fwDroneAlarmRecord, Query query) {
 		IPage<FwDroneAlarmRecordVO> pages = fwDroneAlarmRecordService.selectFwDroneAlarmRecordPage(Condition.getPage(query), fwDroneAlarmRecord);
 		return R.data(pages);
 	}
@@ -156,20 +156,6 @@
 		//}
 		queryWrapper.lambda().eq(FwDroneAlarmRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<FwDroneAlarmRecordExcel> list = fwDroneAlarmRecordService.exportFwDroneAlarmRecord(queryWrapper);
-
-		// String fileName = "无人机告警表数据" + DateUtil.time() + ".xlsx";
-		// String filePath = "D:\\software\\" + fileName; // 替换为实际的本地路径
-		// try (FileOutputStream outputStream = new FileOutputStream(filePath)) {
-		// 	ExcelWriter excelWriter = EasyExcel.write(outputStream, FwDroneAlarmRecordExcel.class)
-		// 		.autoCloseStream(true)
-		// 		.build();
-		// 	WriteSheet writeSheet = EasyExcel.writerSheet("无人机告警表数据表").build();
-		// 	excelWriter.write(list, writeSheet);
-		// 	excelWriter.finish();
-		// } catch (IOException e) {
-		// 	e.printStackTrace();
-		// }
-
 		ExcelUtil.export(response, "无人机告警表数据" + DateUtil.time(), "无人机告警表数据表", list, FwDroneAlarmRecordExcel.class);
 	}
 

--
Gitblit v1.9.3