From b9c7bd2fd2953d13b24efdc2d0289dc70c0705ee Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 12 Aug 2019 10:55:09 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
index 527b123..2d8b897 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -77,14 +77,61 @@
@Override
public Map<Integer,List<SensorUnit>> queryGroupSensorBySids(List<Integer> sensorIds){
SensorUnit sensorUnitQuery = new SensorUnit();
- Map<Integer,List<SensorUnit>> resultList = new HashMap<>();
+ Map<Integer,List<SensorUnit>> resultListMap = new HashMap<>();
for(Integer sensorId: sensorIds) {
sensorUnitQuery.setSensorId(sensorId);
+ sensorUnitQuery.setIsDelete(false);
List<SensorUnit> sensorUnitList = sensorUnitMapper.select(sensorUnitQuery);
if(sensorUnitList!=null&&sensorUnitList.size()>0){
- resultList.put(sensorId,sensorUnitList);
+ resultListMap.put(sensorId,sensorUnitList);
}
}
- return resultList;
+ return resultListMap;
}
+
+ @Override
+ public Map<String, Object> getSensorByMac(String mac) {
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByDeviceMac(mac);
+ if (list!=null && !list.isEmpty()) {
+ Map<String, Object> sensorUnitMap = new HashMap<>();
+ for(Map<String, Object> sensorMap : list) {
+ String sensor_key = (String) sensorMap.get("sensor_key");
+ String name = (String) sensorMap.get("name");
+ sensorUnitMap.put(sensor_key, name);
+ }
+ System.out.println(sensorUnitMap);
+ return sensorUnitMap;
+ } else {
+ Map<String, Object> sensorUnitMap = null;
+ return sensorUnitMap;
+ }
+ }
+
+ @Override
+ public Map<String, Map<String, Object>> getSensorsByMonitPointId(String id) {
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
+ System.out.println(list);
+ if (list!=null && !list.isEmpty()) {
+ Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>();
+ for(Map<String, Object> sensorMap : list) {
+ Map<String, Object> innerMap = new HashMap<>();
+ innerMap.put("unit", sensorMap.get("unit"));
+ innerMap.put("name", sensorMap.get("name"));
+ innerMap.put("rules", sensorMap.get("rules"));
+ String sensor_key = (String) sensorMap.get("sensor_key");
+ sensorUnitMap.put(sensor_key, innerMap);
+ }
+ //System.out.println(sensorUnitMap);
+ return sensorUnitMap;
+ } else {
+ Map<String, Map<String, Object>> sensorUnitMap = null;
+ return sensorUnitMap;
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> getSensorsByMonitPointId2(String id) {
+ List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id);
+ return list;
+ }
}
--
Gitblit v1.8.0