From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/SensorUnitService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/SensorUnitService.java b/src/main/java/com/moral/service/SensorUnitService.java
index 94703af..0b6a123 100644
--- a/src/main/java/com/moral/service/SensorUnitService.java
+++ b/src/main/java/com/moral/service/SensorUnitService.java
@@ -15,4 +15,13 @@
     void remove(Integer id);
 
     Map<Integer,List<SensorUnit>> queryGroupSensorBySids(List<Integer> sensorIds);
+    
+    Map<String, Object> getSensorByMac(String mac);
+    
+    //Map<String, Object> getSensorsByMonitPointId(String id);
+    
+    Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
+    
+    List<Map<String, Object>> getSensorsByMonitPointId2(String id);
+    
 }

--
Gitblit v1.8.0