From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改，同步reids里的信息。数据字典功能添加
---
src/main/java/com/moral/controller/ReportController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 1726d19..72bfd3a 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -38,13 +38,12 @@
@GetMapping("excel")
public ResultBean<Boolean> getExcelReport(HttpServletRequest request,HttpServletResponse response) throws Exception {
Map<String, Object> parameters = getParametersStartingWith(request, null);
- List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData4Excel(parameters);
+ List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
String[][] exportColumn = new String[2][];
- exportColumn[0] = new String[] { "������", "20", "time" };
if (parameters.containsKey("sensors")) {
Set<String> sensors = (Set<String>) parameters.get("sensors");
exportColumn = new String[sensors.size() + 1][];
- exportColumn[0] = new String[] { "������", "20", "time" };
+ // exportColumn[0] = new String[] { "������", "20", "time" };
int index = 1;
for (String sensorKey : sensors) {
String[] split = sensorKey.split("-");
@@ -56,6 +55,7 @@
} else {
exportColumn[1] = new String[] { (String) parameters.get("sensorName"), "10", (String) parameters.get("sensorKey") };
}
+ exportColumn[0] = new String[] { "������", "20", "time" };
OutputStream outputStream = exportData(response, "Excel������", list, exportColumn);
outputStream.flush();
--
Gitblit v1.8.0