From 6bc5d130aa5b30aa6ea32f6c53bebe6fb9dc05f7 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 16 Dec 2020 09:21:32 +0800
Subject: [PATCH] 热力图
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 21b15ac..f56f048 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -9,9 +9,6 @@
import javax.annotation.Resource;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
-
import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.PageBean;
import com.moral.common.util.MyBatisBaseMapUtil;
@@ -22,6 +19,8 @@
import com.moral.service.MonitorPointService;
import com.moral.service.SensorService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
import tk.mybatis.mapper.entity.Example;
@Service
@@ -119,6 +118,11 @@
}
@Override
+ public List<Map<String, Object>> getSensorByDId(String id) {
+ List<Map<String, Object>> list = sensorMapper.getSensorByDId(id);
+ return list;
+ }
+ @Override
public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
List<Map<String, Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
return list;
@@ -137,6 +141,23 @@
@Override
public List<Map<String, String>> getSensorsMaps(String mac) {
List<Sensor> sensors = sensorMapper.getSensorsInfoByMac(mac);
+ Map<String, String> sensorsDescriptionMap = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ sensorsDescriptionMap.put(sensor.getSensorKey(), sensor.getDescription());
+ }
+ Map<String, String> sensorsUnitMap = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ sensorsUnitMap.put(sensor.getSensorKey(), sensor.getUnit());
+ }
+ List<Map<String, String>> sensorsMapList = new ArrayList<>();
+ sensorsMapList.add(sensorsDescriptionMap);
+ sensorsMapList.add(sensorsUnitMap);
+ return sensorsMapList;
+ }
+
+ @Override
+ public List<Map<String, String>> getSensorsAllMap() {
+ List<Sensor> sensors = sensorMapper.selectAll();
Map<String, String> sensorsDescriptionMap = new HashMap<>();
for (Sensor sensor : sensors) {
sensorsDescriptionMap.put(sensor.getSensorKey(), sensor.getDescription());
@@ -200,7 +221,11 @@
Map<String, Object> data = new LinkedHashMap<>();
for (Map.Entry<String, Object> kv : list.get(j).entrySet()) {
if ("monitorPointName".equals(kv.getKey())) {
- data.put("������������(������:" + sensorInfos.get(2).get(i) + ")", kv.getValue());
+ if ("null".equals(sensorInfos.get(2).get(i))) {
+ data.put("������������(������:)", kv.getValue());
+ } else {
+ data.put("������������(������:" + sensorInfos.get(2).get(i) + ")", kv.getValue());
+ }
} else if ("name".equals(kv.getKey())) {
data.put("������������", kv.getValue());
} else {
@@ -225,4 +250,9 @@
return sheets;
}
+ @Override
+ public List<String> getSensorKeys() {
+ return sensorMapper.getSensorKeys();
+ }
+
}
--
Gitblit v1.8.0