From dbed3099ea0dd2a517b739f29943d4ee529760e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 17 Jun 2019 15:23:45 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/controller/ScreenController.java | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index d192bf3..f9c053d 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -951,13 +951,11 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "monitor_point_id", value = "������������id", required = true, paramType = "query", dataType = "String")
})
- public ResultBean<Map<String, Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
+ public ResultBean<List<Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
String monitor_point_id = (String) parameters.get("monitor_point_id");
- System.out.println("ScreenController-----getSensorByMonitorPointId-----monitor_point_id:"+monitor_point_id);
- Map<String, Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
- System.out.println("ScreenController-----getSensorByMonitorPointId-----map:"+map);
- return new ResultBean<Map<String, Map<String, Object>>>(map);
+ List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);
+ return new ResultBean<List<Map<String, Object>>>(map);
}
@GetMapping("AIForecast")
@@ -974,11 +972,9 @@
String monitor_point_id = (String) parameters.get("monitorPoint");
parameters.put("monitorPointId", parameters.remove("monitorPoint"));
String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");
- System.out.println("ScreenController-----AIForecast-----sensorKeys:"+sensorKeys.toString());
parameters.put("sensors", Arrays.asList(sensorKeys));
// monitorPointService.isCompensateCalculation(parameters);
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
- System.out.println("ScreenController-----AIForecast-----list:"+list);
//������������������
Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
@@ -995,12 +991,10 @@
units.add(sensorUnitMap.get(string).get("name").toString());
}else {
Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
- System.out.println("ScreenController-----AIForecast-----sensorMap:"+sensorMap);
units.add(sensorMap.get("unit").toString());
}
}else {
Map<String, Object> sensorMap = sensorService.getSensorBySensorKey(string);
- System.out.println("ScreenController-----AIForecast-----sensorMap:"+sensorMap);
units.add(sensorMap.get("unit").toString());
}
values.add((Number) map.remove(string));
@@ -1008,28 +1002,6 @@
map.put("values", values);
map.put("units", units);
}
-
-
- /*
- if(sensorMap!=null && !sensorMap.isEmpty()) {
- for (Map<String, Object> map : list) {
- System.out.println("ScreenController-----AIForecast-----map:"+map);
- String time = map.get("time").toString();
- time = time.substring(time.length() - 2);
- map.put("time", Integer.valueOf(time));
- map.put("value", map.remove(sensorKey));
- System.out.println("ScreenController-----AIForecast-----map:"+map);
- System.out.println(sensorMap.get("unit"));
- //String sensor = map.get("sensorKey").toString();
- if(sensorMap.get(sensorKey)!=null) {
- map.put("unit", sensorMap.get(sensorKey).get("name"));
- }else {
- map.put("unit", "mg/m��");
- }
- }
- }*/
- //return null;
- System.out.println("ScreenController-----AIForecast-----list:"+list);
return new ResultBean<List<Map<String, Object>>>(list);
}
--
Gitblit v1.8.0