From 15c4ec98dace455967335a27d0f0efdcdfc61f29 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Sat, 22 Jun 2019 17:18:48 +0800 Subject: [PATCH] 生成预测数据 --- src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 64 ++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java index 0ab1c6f..064d1d4 100644 --- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java +++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java @@ -80,6 +80,7 @@ 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){ resultListMap.put(sensorId,sensorUnitList); @@ -87,4 +88,67 @@ } 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); + if (list!=null && !list.isEmpty()) { + Map<String, Object> innerMap = new HashMap<>(); + Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>(); + for(Map<String, Object> sensorMap : list) { + 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"); + String name = (String) sensorMap.get("name"); + 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); + /*if (list!=null && !list.isEmpty()) { + Map<String, Object> innerMap = new HashMap<>(); + Map<String, Map<String, Object>> sensorUnitMap = new HashMap<>(); + for(Map<String, Object> sensorMap : list) { + 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"); + String name = (String) sensorMap.get("name"); + sensorUnitMap.put(sensor_key, innerMap); + } + System.out.println(sensorUnitMap); + return sensorUnitMap; + } else { + Map<String, Map<String, Object>> sensorUnitMap = null; + return sensorUnitMap; + }*/ + return list; + } } -- Gitblit v1.8.0