From 379c55655ef027effbc3fa62b2719b0e9158f0c6 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 04 Sep 2019 11:17:10 +0800
Subject: [PATCH] 按钮文字修改及弹窗内容修改
---
src/main/java/com/moral/controller/ScreenController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 68612a4..3c6991a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -1232,12 +1232,9 @@
String time = YearAndDay + " " + Hour + ":00:00";
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
- System.out.println(timeLocalDateTime);
int month = timeLocalDateTime.getMonth().getValue();
Point dirPoint = historyHourlyService.getDirPoint(parameters);
Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);
- System.out.println(dirPoint.toString());
- System.out.println("getPollutionSourceData:" + getPollutionSourceData);
String mac = parameters.get("mac").toString();
Device device = deviceService.getDeviceByMac(mac, false);
JSONObject params = new JSONObject();
@@ -1271,8 +1268,8 @@
Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);
System.out.println("hourAqi:"+hourAqi);
Map<String, Object> returnMap = new HashMap<>();
- returnMap.put("������AQI", hourAqi.get("AQI"));
- returnMap.put("������AQI", StateControl.get("AQI"));
+ returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));
+ returnMap.put("StateControlAQI", StateControl.get("AQI"));
return new ResultBean<Map<String, Object>>(returnMap);
}
@@ -1290,7 +1287,14 @@
Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);
//������������id������������������������������
account.put("sensor", sensor);
- List<Map<String, Object>> returnList = historyService.getMointorPointRankByOrganizationId(account);
+ List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);
+ List<Map<String, Object>> returnList = new ArrayList<>();
+ for (Map<String, Object> map : rankList) {
+ boolean contains = map.containsKey("sensor");
+ if (contains) {
+ returnList.add(map);
+ }
+ }
return new ResultBean<List<Map<String, Object>>>(returnList);
}
--
Gitblit v1.8.0