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 | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 9a4183f..042724a 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -544,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,
@@ -1215,6 +1233,9 @@
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