From 89965396643cdb17656fd7d70e18fcccb084b6b4 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 13 Jun 2019 17:59:31 +0800
Subject: [PATCH] 修改查询报错
---
src/main/java/com/moral/controller/ScreenController.java | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 4b19fc3..d192bf3 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -946,19 +946,19 @@
return new ResultBean<Map<String, Object>>(map);
}*/
- /*@GetMapping("getSensorByMonitorPointId")
+ @GetMapping("getSensorByMonitorPointId")
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "monitor_point_id", value = "������������id", required = true, paramType = "query", dataType = "String")
})
- public ResultBean<Map<String, Object>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {
+ public ResultBean<Map<String, 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, Object> map = sensorUnitService.getSensorsByMonitPointId(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, Object>>(map);
- }*/
+ return new ResultBean<Map<String, Map<String, Object>>>(map);
+ }
@GetMapping("AIForecast")
@ApiOperation(value = "AI������", notes = "AI������")
@@ -982,30 +982,6 @@
//������������������
Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
-
- /*if(sensorUnitMap!=null && !sensorUnitMap.isEmpty()) {
- for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- time = time.substring(time.length() - 2);
- map.put("time", Integer.valueOf(time));
- List<Number> values = new ArrayList<Number>();
- for (String string : sensorKeys) {
- values.add((Number) map.remove(string));
- }
- map.put("values", values);
- }
- }else {
- for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- time = time.substring(time.length() - 2);
- map.put("time", Integer.valueOf(time));
- List<Number> values = new ArrayList<Number>();
- for (String string : sensorKeys) {
- values.add((Number) map.remove(string));
- }
- map.put("values", values);
- }
- }*/
for (Map<String, Object> map : list) {
String time = map.get("time").toString();
@@ -1019,10 +995,12 @@
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));
--
Gitblit v1.8.0