From f0aa8adb5cafc5829138bc0b096be7fd1e94b6f6 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 17:07:29 +0800
Subject: [PATCH] 告警记录导出
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneAlarmRecordController.java | 42 ++++--------------------------------------
1 files changed, 4 insertions(+), 38 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 3d78873..55458e8 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
@@ -24,6 +24,7 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
@@ -37,6 +38,7 @@
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.param.FwDroneAlarmRecordExportParam;
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
import org.sxkj.fw.record.excel.FwDroneAlarmRecordExcel;
import org.sxkj.fw.record.wrapper.FwDroneAlarmRecordWrapper;
@@ -78,16 +80,6 @@
FwDroneAlarmRecordEntity detail = fwDroneAlarmRecordService.getOne(Condition.getQueryWrapper(fwDroneAlarmRecord));
return R.data(FwDroneAlarmRecordWrapper.build().entityVO(detail));
}
- /**
- * 无人机告警表 分页
- */
- // @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));
- // }
/**
* 无人机告警表 自定义分页
@@ -99,27 +91,6 @@
IPage<FwDroneAlarmRecordVO> pages = fwDroneAlarmRecordService.selectFwDroneAlarmRecordPage(Condition.getPage(query), fwDroneAlarmRecord);
return R.data(pages);
}
-
- /**
- * 无人机告警表 新增
- */
- // @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));
- // }
/**
* 无人机告警表 新增或修改
@@ -149,13 +120,8 @@
@GetMapping("/export-fwDroneAlarmRecord")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入fwDroneAlarmRecord")
- public void exportFwDroneAlarmRecord(@ApiIgnore @RequestParam Map<String, Object> fwDroneAlarmRecord, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<FwDroneAlarmRecordEntity> queryWrapper = Condition.getQueryWrapper(fwDroneAlarmRecord, FwDroneAlarmRecordEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(FwDroneAlarmRecord::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(FwDroneAlarmRecordEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<FwDroneAlarmRecordExcel> list = fwDroneAlarmRecordService.exportFwDroneAlarmRecord(queryWrapper);
+ public void exportFwDroneAlarmRecord(FwDroneAlarmRecordExportParam fwDroneAlarmRecord, HttpServletResponse response) {
+ List<FwDroneAlarmRecordExcel> list = fwDroneAlarmRecordService.exportFwDroneAlarmRecord(fwDroneAlarmRecord);
ExcelUtil.export(response, "无人机告警表数据" + DateUtil.time(), "无人机告警表数据表", list, FwDroneAlarmRecordExcel.class);
}
--
Gitblit v1.9.3