From c078390a7398946e88d9ef7446bb2b5562ce77a2 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Wed, 12 Jun 2019 14:28:14 +0800 Subject: [PATCH] 增加返回溯源第二个点的service实现 --- src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 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..fd61ddd 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,48 @@ } return resultListMap; } + + @Override + public Map<String, Object> getSensorByMac(String mac) { + System.out.println("SensorUnitServiceImpl-----getSensorByMac-----mac:"+mac); + List<Map<String, Object>> list = sensorUnitMapper.getSensorsByDeviceMac(mac); + System.out.println("SensorUnitServiceImpl----getSensorByMac----list:"+list); + 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"); + System.out.println("SensorUnitServiceImpl----getSensorByMac----sensor_key:"+sensor_key); + String name = (String) sensorMap.get("name"); + System.out.println("SensorUnitServiceImpl----getSensorByMac----name:"+name); + sensorUnitMap.put(sensor_key, name); + } + System.out.println(sensorUnitMap); + return sensorUnitMap; + } else { + Map<String, Object> sensorUnitMap = null; + return sensorUnitMap; + } + } + + @Override + public Map<String, Object> getSensorsByMonitPointId(String id) { + System.out.println("SensorUnitServiceImpl-----getSensorsByMonitPointId-----id:"+id); + List<Map<String, Object>> list = sensorUnitMapper.getSensorsByMonitPointId(id); + System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----list:"+list); + 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"); + System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----sensor_key:"+sensor_key); + String name = (String) sensorMap.get("name"); + System.out.println("SensorUnitServiceImpl----getSensorsByMonitPointId----name:"+name); + sensorUnitMap.put(sensor_key, name); + } + System.out.println(sensorUnitMap); + return sensorUnitMap; + } else { + Map<String, Object> sensorUnitMap = null; + return sensorUnitMap; + } + } } -- Gitblit v1.8.0