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-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
index aea23f7..4fd2877 100644
--- a/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
+++ b/blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java
@@ -1,6 +1,7 @@
 package org.springblade.report.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +13,8 @@
 import org.springblade.report.service.ReportFileService;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;
@@ -45,7 +48,7 @@
 
 
 	/**
-	 * 获取包裹数据集合
+	 * 获取实时警情数据集合
 	 * @param beanName 调用名称
 	 * @param dataName 返回数据名称
 	 * @param map map集合数据
@@ -56,6 +59,22 @@
 		String body = JSON.toJSONString(map);
 		if (null!=beanName){
 			return reportClient.getAlarmList(body);
+		}
+		return null;
+	}
+
+	/**
+	 * 获取实时警情图表数据
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	public List<ReportReturnData> getAlarmPie(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String body = JSON.toJSONString(map);
+		if (null!=beanName){
+			return reportClient.getAlarmPie(body);
 		}
 		return null;
 	}
@@ -78,6 +97,22 @@
 	}
 
 	/**
+	 * 获取健康码图表数据
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	public List<ReportReturnData> getHealthcodePie(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String s = JSON.toJSONString(map);
+		if (null!=beanName){
+			return reportClient.getHealthcodePie(s);
+		}
+		return null;
+	}
+
+	/**
 	 * 获取体温数据集合
 	 * @param beanName 调用名称
 	 * @param dataName 返回数据名称
@@ -88,12 +123,31 @@
 		//将map转换为json对象
 		String body = JSON.toJSONString(map);
 		if (null!=beanName){
+			System.out.println("reportClient.getAnimalHeatList(body) = " + reportClient.getAnimalHeatList(body));
 			return reportClient.getAnimalHeatList(body);
 		}
 		return null;
 	}
 
 	/**
+	 * 获取体温数据集合
+	 * @param beanName 调用名称
+	 * @param dataName 返回数据名称
+	 * @param map map集合数据
+	 * @return
+	 */
+	@PostMapping("getAnimalHeatPie")
+	public List<ReportReturnData> getAnimalHeatPie(String beanName, String dataName, Map<String,Object> map){
+		//将map转换为json对象
+		String body = JSON.toJSONString(map);
+		if (null!=beanName){
+			System.out.println("reportClient = " + reportClient.getAnimalHeatPie(body));
+			return reportClient.getAnimalHeatPie(body);
+		}
+		return null;
+	}
+
+	/**
 	 * 获取包裹数据集合
 	 * @param beanName 调用名称
 	 * @param dataName 返回数据名称

--
Gitblit v1.9.3