From ca66f2f175e6b66eda193ce58439515a9484e6b7 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Tue, 03 Sep 2019 13:44:06 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/service/SensorUnitService.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/service/SensorUnitService.java b/src/main/java/com/moral/service/SensorUnitService.java index 5032cdd..0b6a123 100644 --- a/src/main/java/com/moral/service/SensorUnitService.java +++ b/src/main/java/com/moral/service/SensorUnitService.java @@ -18,6 +18,10 @@ Map<String, Object> getSensorByMac(String mac); - Map<String, Object> getSensorsByMonitPointId(String id); + //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