From 5fcdc8ba338a9f8730262970547274b0dcfe6b4d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 09 Jan 2020 15:26:36 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/service/SensorService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index 0b567a8..51222a5 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -20,15 +20,21 @@
List<Sensor> queryListByVersionNo(Integer versionNo);
public void addOrModify(Sensor sensor);
+
public void deleteByIds(Integer... ids);
List<Sensor> queryByOrgId(Integer organizationId);
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);
+
+ 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;
+
+ List<Map<String, String>> getSensorsMaps(String mac);
+
}
--
Gitblit v1.8.0