From 36afc3a1f1437b8a3283dc0bf6475e96fded05a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 12 Apr 2021 22:35:36 +0800
Subject: [PATCH] 新增主动报警alarm,健康码,体温,包裹,违禁品导出数据接口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index 665ba1b..a2018e6 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -22,19 +22,21 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.aspectj.weaver.patterns.Declare;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 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.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.jfpt.alarm.entity.Alarm;
 import org.springblade.jfpt.alarm.service.IAlarmService;
 import org.springblade.jfpt.alarm.vo.AlarmVO;
 import org.springblade.jfpt.alarm.wrapper.AlarmWrapper;
 import org.springblade.jfpt.animalheat.service.AnimalHeatService;
+import org.springblade.jfpt.alarm.vo.AlarmExcel;
+import org.springblade.jfpt.animalheat.vo.AnimalHeatExcel;
 import org.springblade.jfpt.healthcode.service.IhealthcodeService;
-import org.springblade.jfpt.operation.entity.Operation;
 import org.springblade.jfpt.operation.service.IOperationService;
 import org.springblade.jfpt.operation.vo.OperationVO;
 import org.springblade.jfpt.parcel.service.ParcelService;
@@ -620,4 +622,14 @@
 		return list;
 	}
 
+	/**
+	 * 导出主动报警数据表格
+	 * @param alarmVO 查询条件
+	 * @param response
+	 */
+	@GetMapping("/export-alarm")
+	public void exportAlarm(AlarmVO alarmVO, HttpServletResponse response){
+		List<AlarmExcel> list = alarmService.exportAlarm(alarmVO);
+		ExcelUtil.export(response, "主动报警数据" + DateUtil.time(), "主动报警数据表", list, AlarmExcel.class);
+	}
 }

--
Gitblit v1.9.3