From ef3a45a366ea8451f2581547fa6a3894bd1d672f Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 29 Aug 2019 10:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index 1eb869d..dad9692 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -27,4 +27,10 @@
     public List<Sensor> getAllSensors();
     
     Map<String, Object> getSensorBySensorKey(String SensorKey);
+    
+    List<Map<String,Object>> getSensorByDeviceId(String id);
+    
+    List<Map<String,Object>> getSensorByMonitorPointId(String monitor_point_id);
+
+    Map<String, String> getSensorsMap(Map<String, Object> parameters) throws Exception;
 }

--
Gitblit v1.8.0