From 4a99552e883976adc8b726499caaebbe36f19ea7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 06 Jul 2020 10:25:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 b96018f..d399d9f 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -35,6 +35,12 @@
List<Map<String, String>> getSensorsMaps(String mac);
+ List<Map<String, String>> getSensorsAllMap();
+
List<Sensor> selectSenosrsByOrgId(Map<String, Object> parameters);
+ List<List<String>> listSensorInfos(String[] sensorsResult);
+
+ List<List<Map<String, Object>>> listExcelDatas(List<List<String>> sensorInfos, List<Map<String, Object>> list);
+
}
--
Gitblit v1.8.0