From e7eb9aff4f348f2b6c245be5215f571c2789fb8e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Apr 2020 15:42:58 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/ScreenController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 829aabe..3643322 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -842,6 +842,8 @@
parameters.put("sensors", Arrays.asList(sensorKeys));
parameters.put("sensors2", s);
List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ System.out.println("monitorlist" + monitorList);
+
for (Map<String, Object> monitorMap : monitorList) {
String time = monitorMap.get("time").toString();
time = time.substring(time.length() - 2);
@@ -880,7 +882,6 @@
}
parameters.put("sensors1", sensorKey1);
-
List<Map<String, Object>> areaList = historyMinutelyService.getAreaAvgDataByAreaCode(parameters);
if (areaList.isEmpty()) {
Integer areaCode = Integer.valueOf(request.getParameter("areaCode"));
@@ -896,6 +897,19 @@
areaMap.put("time", Integer.valueOf(time));
}
+ ArrayList<Map<String, Object>> resultList = new ArrayList<>();
+ if (areaList.isEmpty()) {
+ resultList.addAll(monitorList);
+ for (Map<String, Object> map : monitorList) {
+ ArrayList<String> values = new ArrayList<>();
+ values.add(null);
+ values.add(map.remove(s).toString());
+ map.put("values", values);
+ }
+ return new ResultBean<List<Map<String, Object>>>(resultList);
+
+ }
+
Integer max = 0;
if (areaList.size() != 0) {
Map<String, Object> areaMap = areaList.get(areaList.size() - 1);
@@ -909,8 +923,6 @@
} else {
maxTime = max;
}
-
- ArrayList<Map<String, Object>> resultList = new ArrayList<>();
for (int i = 0; i <= maxTime; i++) {
resultList.add(null);
@@ -929,7 +941,7 @@
String resultTime = resultMap.get("time").toString();
if (resultTime.equals(monitorTime)) {
String value = resultMap.remove(s).toString();
- String value1 = monitorMap.remove(s).toString();
+ String value1 = monitorMap.get(s).toString();
values.add(value);
values.add(value1);
resultMap.put("values", values);
@@ -952,9 +964,7 @@
resultMap.put("values", values);
}
}
-
return new ResultBean<List<Map<String, Object>>>(resultList);
-
}
@GetMapping("getmpoint-byid")
@@ -1539,5 +1549,4 @@
}
return new ResultBean<List<Map<String, Object>>>(list);
}
-
}
--
Gitblit v1.8.0