From 8fb013a6d6707929799e9f7a8a82f311cbca29ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Dec 2020 14:47:04 +0800
Subject: [PATCH] update大屏年，月数据查询接口
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 10e414d..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());
@@ -229,4 +250,9 @@
return sheets;
}
+ @Override
+ public List<String> getSensorKeys() {
+ return sensorMapper.getSensorKeys();
+ }
+
}
--
Gitblit v1.8.0