From dfed9c07aa8da5791d568736716bc4b44d59ebaf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 16 Apr 2021 13:33:53 +0800
Subject: [PATCH] jfreechart+easyExcel 方式导出报表

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java |   97 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
index b1fde4d..75aed39 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feign/ReportFeign.java
@@ -36,6 +36,33 @@
 	public List<AlarmExcel> getAlarmList(@RequestBody String body){
 		Map<String,Object> map = JSONObject.parseObject(body);
 		//创建对象，并封装数据
+		AlarmVO alarmVO = getAlarmVO(map);
+		//查询数据并返回数据
+		List<AlarmExcel> excelList = iAlarmService.exportAlarm(alarmVO);
+		return excelList;
+	}
+
+	/**
+	 * 获取实时警情数据集合
+	 * @param body map集合数据
+	 * @return
+	 */
+	@PostMapping("getAlarmPie")
+	public List<ReportReturnData> getAlarmPie(@RequestBody String body){
+		Map<String,Object> map = JSONObject.parseObject(body);
+		//创建对象，并封装数据
+		AlarmVO alarmVO = getAlarmVO(map);
+		//查询数据并返回数据
+		List<ReportReturnData> excelList = iAlarmService.getAlarmPie(alarmVO);
+		return excelList;
+	}
+
+	/**
+	 * 封装实时警情查询条件
+	 * @param map
+	 * @return
+	 */
+	private AlarmVO getAlarmVO(Map<String, Object> map) {
 		AlarmVO alarmVO = new AlarmVO();
 		if (null!=map.get("beginTime")) {
 			alarmVO.setBeginTime(map.get("beginTime").toString());
@@ -49,10 +76,9 @@
 		if (null!=map.get("timeDesc")) {
 			alarmVO.setTimeDesc(map.get("timeDesc").toString());
 		}
-		//查询数据并返回数据
-		List<AlarmExcel> excelList = iAlarmService.exportAlarm(alarmVO);
-		return excelList;
+		return alarmVO;
 	}
+
 
 	/**
 	 * 获取健康码数据集合
@@ -63,6 +89,35 @@
 	public List<HealthcodeExcel> getHealthcodeList(@RequestBody String body){
 		Map<String,Object> map = JSONObject.parseObject(body);
 		//创建对象，并封装数据
+		HealthcodeVO healthcodeVO = getHealthcodeVo(map);
+		//查询数据并返回数据
+		List<HealthcodeExcel> excelList = ihealthcodeService.exportHealthcode(healthcodeVO);
+		return excelList;
+	}
+
+
+
+	/**
+	 * 获取健康码图标数据
+	 * @param body map集合数据
+	 * @return
+	 */
+	@PostMapping("getHealthcodePie")
+	public List<HealthcodeExcel> getHealthcodePie(@RequestBody String body){
+		Map<String,Object> map = JSONObject.parseObject(body);
+		//创建对象，并封装数据
+		HealthcodeVO healthcodeVO = getHealthcodeVo(map);
+		//查询数据并返回数据
+		List<HealthcodeExcel> excelList = ihealthcodeService.getHealthcodePie(healthcodeVO);
+		return excelList;
+	}
+
+	/**
+	 * 封装健康码条件数据
+	 * @param map
+	 * @return
+	 */
+	private HealthcodeVO getHealthcodeVo(Map<String, Object> map) {
 		HealthcodeVO healthcodeVO = new HealthcodeVO();
 		if (null!=map.get("begTime")) {
 			healthcodeVO.setBegTime(map.get("begTime").toString());
@@ -76,9 +131,7 @@
 		if (null!=map.get("timeDesc")) {
 			healthcodeVO.setTimeDesc(map.get("timeDesc").toString());
 		}
-		//查询数据并返回数据
-		List<HealthcodeExcel> excelList = ihealthcodeService.exportHealthcode(healthcodeVO);
-		return excelList;
+		return healthcodeVO;
 	}
 
 	/**
@@ -90,6 +143,34 @@
 	public List<AnimalHeatExcel> getAnimalHeatList(@RequestBody String body){
 		Map<String,Object> map = JSONObject.parseObject(body);
 		//创建对象，并封装数据
+		AnimalHeatVo animalHeatVo = getAnimalHeatVo(map);
+		//查询数据并返回数据
+		List<AnimalHeatExcel> excelList = animalHeatService.exportAnimalHeat(animalHeatVo);
+		return excelList;
+	}
+
+	/**
+	 * 获取体温图表数据
+	 * @param body map集合数据
+	 * @return
+	 */
+	@PostMapping("getAnimalHeatPie")
+	public List<ReportReturnData> getAnimalHeatPie(@RequestBody String body){
+		Map<String,Object> map = JSONObject.parseObject(body);
+		//创建对象，并封装数据
+		AnimalHeatVo animalHeatVo = getAnimalHeatVo(map);
+		//查询数据并返回数据
+		List<ReportReturnData> reportReturnData = animalHeatService.getAnimalHeatPie(animalHeatVo);
+		System.out.println("reportReturnData = " + reportReturnData);
+		return reportReturnData;
+	}
+
+	/**
+	 * 体温数据条件封装
+	 * @param map
+	 * @return
+	 */
+	private AnimalHeatVo getAnimalHeatVo(Map<String, Object> map) {
 		AnimalHeatVo animalHeatVo = new AnimalHeatVo();
 		if (null!=map.get("begTime")) {
 			animalHeatVo.setBegTime(map.get("begTime").toString());
@@ -103,9 +184,7 @@
 		if (null!=map.get("timeDesc")) {
 			animalHeatVo.setTimeDesc(map.get("timeDesc").toString());
 		}
-		//查询数据并返回数据
-		List<AnimalHeatExcel> excelList = animalHeatService.exportAnimalHeat(animalHeatVo);
-		return excelList;
+		return animalHeatVo;
 	}
 
 	/**

--
Gitblit v1.9.3