From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java
index 22b63dc..1f38c9d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/controller/AnimalHeatController.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.builder.ExcelWriterBuilder;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -36,8 +37,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
/**
* 体温监测控制层
@@ -98,8 +101,34 @@
* @param response 返回域
*/
@GetMapping("/export-animalHeat")
- public void exportAnimalHeat(AnimalHeatVo animalHeatVo,HttpServletResponse response){
+ public void exportAnimalHeat(AnimalHeatVo animalHeatVo,HttpServletResponse response) throws Exception{
List<AnimalHeatExcel> list = animalHeatService.exportAnimalHeat(animalHeatVo);
+// response.setContentType("application/vnd.ms-excel");
+// response.setCharacterEncoding(Charsets.UTF_8.name());
+// String fileName = URLEncoder.encode("体温检测数据" + DateUtil.time(), Charsets.UTF_8.name());
+// response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+// ExcelWriter writer = new ExcelWriterBuilder()
+// .autoCloseStream(true)
+// .file(response.getOutputStream())
+// .head(AnimalHeatExcel.class)
+// .build();
+// // xlsx文件上上限是104W行左右,这里如果超过104W需要分Sheet
+// WriteSheet writeSheet = new WriteSheet();
+// writeSheet.setSheetName("target");
+// long lastBatchMaxId = 0L;
+// int limit = 500;
+// for (; ; ) {
+// List<AnimalHeatExcel> list = animalHeatService.exportAnimalHeat(animalHeatVo);
+// List list = orderService.queryByScrollingPagination(paymentDateTimeStart, paymentDateTimeEnd, lastBatchMaxId, limit);
+// if (list.isEmpty()) {
+// writer.finish();
+// break;
+// } else {
+// lastBatchMaxId = list.stream().map(AnimalHeatExcel::getId).max(Long::compareTo).orElse(Long.MAX_VALUE);
+// writer.write(list, writeSheet);
+// }
+// }
+// EasyExcel.write(response.getOutputStream(), AnimalHeatExcel.class).sheet("体温检测数据表").doWrite(list);
ExcelUtil.export(response, "体温检测数据" + DateUtil.time(), "体温检测数据表", list,AnimalHeatExcel.class );
}
--
Gitblit v1.9.3