From 74bb3f9cc4761fd4204ce8b6479dd0024b422355 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 15 Nov 2017 09:46:36 +0800
Subject: [PATCH] 查询AQI接口采用多线程的方式
---
src/main/java/com/moral/monitor/controller/ReportController.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/moral/monitor/controller/ReportController.java b/src/main/java/com/moral/monitor/controller/ReportController.java
index 509ad8b..54a855b 100644
--- a/src/main/java/com/moral/monitor/controller/ReportController.java
+++ b/src/main/java/com/moral/monitor/controller/ReportController.java
@@ -39,36 +39,35 @@
if (ObjectUtils.isEmpty(mac) || ObjectUtils.isEmpty(time) || ObjectUtils.isEmpty(type)) {
result.put("msg", "���������������������");
} else {
- String[][] exportColumn = new String[][] {
- new String[] { "������", "20", "time" },
- new String[] { "Pm2.5", "10", "e1" },
- new String[] { "Pm10", "20", "e2" },
- new String[] { "0.1���0.3um���", "30", "e3" },
- new String[] { "0.1���2.5um���", "10", "e4" },
- new String[] { "������", "10", "e5" },
- new String[] { "������", "10", "e6" },
- new String[] { "������", "10", "e7" },
- new String[] { "������(O2)", "10", "e8" },
- new String[] { "������(CL2)", "10", "e9" },
- new String[] { "������������(CO)", "10", "e10" },
- new String[] { "������������(SO2)", "10", "e11" },
- new String[] { "������", "10", "e12" },
- new String[] { "������", "10", "e13" },
- new String[] { "������(NH3)", "10", "e14" },
- new String[] { "������(O3)", "10", "e15" },
- new String[] { "������������(NO2)", "10", "e16" },
- new String[] { "���������������������", "10", "e17" },
- new String[] { "������", "10", "e18" },
- new String[] { "������������(CO2)", "10", "e19" }
- };
List<Map<String, Object>> sensorsAverage = reportService.getSensorsAverageByEquipment(parameters);
if (ObjectUtils.isEmpty(sensorsAverage)) {
result.put("msg", "���������������");
} else {
+ String[][] exportColumn = new String[][] {
+ new String[] { "������", "20", "time" },
+ new String[] { "Pm2.5", "10", "e1" },
+ new String[] { "Pm10", "20", "e2" },
+ new String[] { "0.1���0.3um���", "30", "e3" },
+ new String[] { "0.1���2.5um���", "10", "e4" },
+ new String[] { "������", "10", "e5" },
+ new String[] { "������", "10", "e6" },
+ new String[] { "������", "10", "e7" },
+ new String[] { "������(O2)", "10", "e8" },
+ new String[] { "������(CL2)", "10", "e9" },
+ new String[] { "������������(CO)", "10", "e10" },
+ new String[] { "������������(SO2)", "10", "e11" },
+ new String[] { "������", "10", "e12" },
+ new String[] { "������", "10", "e13" },
+ new String[] { "������(NH3)", "10", "e14" },
+ new String[] { "������(O3)", "10", "e15" },
+ new String[] { "������������(NO2)", "10", "e16" },
+ new String[] { "���������������������", "10", "e17" },
+ new String[] { "������", "10", "e18" },
+ new String[] { "������������(CO2)", "10", "e19" }
+ };
OutputStream outputStream = ExportExcelUtils.exportData(response, time + "���" + "���������" + mac + type + "������", sensorsAverage, exportColumn);
outputStream.flush();
outputStream.close();
- result.put("msg", "������������");
}
}
} catch (BusinessException be) {
--
Gitblit v1.8.0