From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 3a5e7ce..f56f048 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -118,6 +118,11 @@
}
@Override
+ public List<Map<String, Object>> getSensorByDId(String id) {
+ List<Map<String, Object>> list = sensorMapper.getSensorByDId(id);
+ return list;
+ }
+ @Override
public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
List<Map<String, Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
return list;
@@ -245,4 +250,9 @@
return sheets;
}
+ @Override
+ public List<String> getSensorKeys() {
+ return sensorMapper.getSensorKeys();
+ }
+
}
--
Gitblit v1.8.0