From 9009798abd7abfd726bcda80267c7d53dd3b8da3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/controller/ScreenController.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 96c1709..5b7ffbc 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -865,11 +865,13 @@
Long code = monitorPoint.getAreaCode().longValue();
String regionName = areaService.queryFullNameByCode(code);
Device device = deviceService.getDeviceByMac(mac, false);
+ Device deviceSecond = deviceService.getDeviceByLongitudeAsc(mac);
params.put("sensorInfo", resultMap);
params.put("regionCode", code);
params.put("regionName", regionName);
params.put("monitorPoint", monitorPoint);
params.put("device", device);
+ params.put("deviceSecond",deviceSecond);
String paramsJson = params.toJSONString();
model.addObject("traceabilityParams", paramsJson);
model.setViewName("traceability");
@@ -904,7 +906,7 @@
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")
@@ -916,7 +918,7 @@
Map<String, Object> map = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
System.out.println("ScreenController-----getSensorByMonitorPointId-----map:"+map);
return new ResultBean<Map<String, Object>>(map);
- }
+ }*/
@GetMapping("AIForecast")
@ApiOperation(value = "AI������", notes = "AI������")
@@ -934,19 +936,41 @@
Object sensorKey = parameters.remove("sensorKey");
parameters.put("sensors", Arrays.asList(sensorKey));
List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
+ System.out.println("ScreenController-----AIForecast-----list:"+list);
//������������������
- Map<String, Object> sensorMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
+ Map<String, Map<String, Object>> sensorMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);
- for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- time = time.substring(time.length() - 2);
- map.put("time", Integer.valueOf(time));
- map.put("value", map.remove(sensorKey));
+ if(sensorMap!=null && !sensorMap.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));
+ map.put("value", map.remove(sensorKey));
+ String sensor = map.get("sensorKey").toString();
+ if(sensorMap.get(sensor)!=null) {
+ map.put("unit", sensorMap.get("unit"));
+ map.put("name", sensorMap.get("name"));
+ map.put("rules", sensorMap.get("rules"));
+ }else {
+ map.put("unit", null);
+ map.put("name", null);
+ map.put("rules", null);
+ }
+ }
+ }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));
+ map.put("value", map.remove(sensorKey));
+ map.put("unit", null);
+ map.put("name", null);
+ map.put("rules", null);
+ }
}
-
- return null;
- //return new ResultBean<List<Map<String, Object>>>(result);
+ //return null;
+ return new ResultBean<List<Map<String, Object>>>(list);
}
}
--
Gitblit v1.8.0