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 |   57 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 34 insertions(+), 23 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 b712511..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
@@ -16,6 +16,9 @@
  */
 package org.sxkj.fw.record.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,10 +30,12 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
 import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
 import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
 import org.sxkj.fw.record.excel.FwDroneAlarmRecordExcel;
@@ -41,15 +46,19 @@
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Map;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 /**
  * 无人机告警表 控制器
  *
  * @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
  */
 @RestController
 @AllArgsConstructor
@@ -72,13 +81,13 @@
 	/**
 	 * 无人机告警表 分页
 	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入fwDroneAlarmRecord")
-	public R<IPage<FwDroneAlarmRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDroneAlarmRecord, Query query) {
-		IPage<FwDroneAlarmRecordEntity> pages = fwDroneAlarmRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDroneAlarmRecord, FwDroneAlarmRecordEntity.class));
-		return R.data(FwDroneAlarmRecordWrapper.build().pageVO(pages));
-	}
+	// @GetMapping("/list")
+	// @ApiOperationSupport(order = 2)
+	// @ApiOperation(value = "分页", notes = "传入fwDroneAlarmRecord")
+	// public R<IPage<FwDroneAlarmRecordVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDroneAlarmRecord, Query query) {
+	// 	IPage<FwDroneAlarmRecordEntity> pages = fwDroneAlarmRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDroneAlarmRecord, FwDroneAlarmRecordEntity.class));
+	// 	return R.data(FwDroneAlarmRecordWrapper.build().pageVO(pages));
+	// }
 
 	/**
 	 * 无人机告警表 自定义分页
@@ -86,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);
 	}
@@ -94,22 +103,23 @@
 	/**
 	 * 无人机告警表 新增
 	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入fwDroneAlarmRecord")
-	public R save(@Valid @RequestBody FwDroneAlarmRecordEntity fwDroneAlarmRecord) {
-		return R.status(fwDroneAlarmRecordService.save(fwDroneAlarmRecord));
-	}
+	// @PostMapping("/save")
+	// @ApiOperationSupport(order = 4)
+	// @ApiOperation(value = "新增", notes = "传入fwDroneAlarmRecord")
+	// public R save(@Valid @RequestBody FwDroneAlarmRecordDTO fwDroneAlarmRecord) {
+	// 	FwDroneAlarmRecordEntity fwDroneAlarmRecordEntity = Objects.requireNonNull(BeanUtil.copy(fwDroneAlarmRecord, FwDroneAlarmRecordEntity.class));
+	// 	return R.status(fwDroneAlarmRecordService.save(fwDroneAlarmRecordEntity));
+	// }
 
 	/**
 	 * 无人机告警表 修改
 	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入fwDroneAlarmRecord")
-	public R update(@Valid @RequestBody FwDroneAlarmRecordEntity fwDroneAlarmRecord) {
-		return R.status(fwDroneAlarmRecordService.updateById(fwDroneAlarmRecord));
-	}
+	// @PostMapping("/update")
+	// @ApiOperationSupport(order = 5)
+	// @ApiOperation(value = "修改", notes = "传入fwDroneAlarmRecord")
+	// public R update(@Valid @RequestBody FwDroneAlarmRecordEntity fwDroneAlarmRecord) {
+	// 	return R.status(fwDroneAlarmRecordService.updateById(fwDroneAlarmRecord));
+	// }
 
 	/**
 	 * 无人机告警表 新增或修改
@@ -117,8 +127,9 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入fwDroneAlarmRecord")
-	public R submit(@Valid @RequestBody FwDroneAlarmRecordEntity fwDroneAlarmRecord) {
-		return R.status(fwDroneAlarmRecordService.saveOrUpdate(fwDroneAlarmRecord));
+	public R submit(@Valid @RequestBody FwDroneAlarmRecordDTO fwDroneAlarmRecord) {
+		FwDroneAlarmRecordEntity fwDroneAlarmRecordEntity = Objects.requireNonNull(BeanUtil.copy(fwDroneAlarmRecord, FwDroneAlarmRecordEntity.class));
+		return R.status(fwDroneAlarmRecordService.saveOrUpdate(fwDroneAlarmRecordEntity));
 	}
 
 	/**

--
Gitblit v1.9.3