From f32e22e52376cabe49e8c7d1f52adb4b1aebffd3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 20 Nov 2019 17:15:08 +0800
Subject: [PATCH] update：移动到设备marker上实时显示因子数据
---
src/main/java/com/moral/controller/ScreenController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 5733c13..042724a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -21,6 +21,7 @@
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.log4j.Logger;
import org.dom4j.Document;
@@ -543,6 +544,24 @@
}
}
+ @GetMapping("/getSensorsMap")
+ public ResultBean getSensorsMapOnly(String mac){
+ Map<String, String> paramMap = sensorService.getSensorsMapOnly(mac);
+ ResultBean<Map<String, String>> resultBean = new ResultBean();
+ resultBean.setData(paramMap);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
+
+ @GetMapping("/getSensorsUnitMap")
+ public ResultBean getSensorsUnitMap(String mac){
+ Map<String, String> paramMap = sensorService.getSensorsUnitMap(mac);
+ ResultBean<Map<String, String>> resultBean = new ResultBean();
+ resultBean.setData(paramMap);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
+
@RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
@ResponseBody
public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
@@ -1030,10 +1049,11 @@
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(sensorUnitList);
+ 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("sensor_key"))) {
+ if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensorKey"))) {
sensorMap.put("unit", sensorUnitMap.get("name"));
}
}
@@ -1209,7 +1229,13 @@
LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
int month = timeLocalDateTime.getMonth().getValue();
Point dirPoint = historyHourlyService.getDirPoint(parameters);
- Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);
+ Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
+ if (MapUtils.isEmpty(getPollutionSourceData)) {
+ getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);
+ }
+ if (MapUtils.isEmpty(getPollutionSourceData)) {
+ getPollutionSourceData = new HashMap<>();
+ }
String mac = parameters.get("mac").toString();
Device device = deviceService.getDeviceByMac(mac, false);
JSONObject params = new JSONObject();
--
Gitblit v1.8.0