From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/controller/ScreenController.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index e5518cc..e4bb92c 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -18,8 +18,10 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.Set;
import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
@@ -100,9 +102,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
@@ -1069,7 +1068,6 @@
Map<String, Object> map = list.get(0);
String monitor_point_id = map.get("monitor_point_id").toString();
List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println(sensorUnitList);
for (Map<String, Object> sensorMap : list) {
for (Map<String, Object> sensorUnitMap : sensorUnitList) {
if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {
@@ -1090,8 +1088,6 @@
String monitor_point_id = (String) parameters.get("monitor_point_id");
List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);
List<Map<String, Object>> sensorUnitList = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
- System.out.println("list:" + list);
- System.out.println("sensorUnitList:" + sensorUnitList);
for (Map<String, Object> sensorMap : list) {
for (Map<String, Object> sensorUnitMap : sensorUnitList) {
if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
@@ -1306,9 +1302,7 @@
sensorMap.put("e10", Double.parseDouble(map.get("co").toString()));
sensorMap.put("e15", Double.parseDouble(map.get("o3").toString()));
Map<String, Object> StateControl = AQICalculation.hourlyAQI(sensorMap);
- System.out.println("StateControl:" + StateControl);
Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);
- System.out.println("hourAqi:" + hourAqi);
Map<String, Object> returnMap = new HashMap<>();
returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));
returnMap.put("StateControlAQI", StateControl.get("AQI"));
@@ -1407,9 +1401,6 @@
List<Map<String, Object>> list = new ArrayList<>();
if (!CollectionUtils.isEmpty(macList)) {
list = historyMinutelyService.getDevicesAvgDataToExcel(parameters);
- }
- for (Map<String, Object> map : list) {
- map.put("value", map.remove(sensorKey));
}
return new ResultBean<List<Map<String, Object>>>(list);
}
--
Gitblit v1.8.0