From 88954c5d1a31b0e0022e7f2fb882594c6e5c5982 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Sep 2020 16:11:05 +0800
Subject: [PATCH] 更新射阳大屏地图显示不正确
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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..3a5e7ce 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
@@ -152,6 +151,23 @@
}
@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());
+ }
+ 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<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters) {
List<String> macList = new ArrayList<>();
List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);
@@ -200,7 +216,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 {
--
Gitblit v1.8.0