From 34da70747500f78d893b8becab23a6b95d89fd5e Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 12 Jun 2019 14:29:53 +0800
Subject: [PATCH] 修改溯源接口传入第二个点
---
src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 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..fd61ddd 100644
--- a/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorUnitServiceImpl.java
@@ -77,14 +77,59 @@
@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) {
+ 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