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/SensorService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index dad9692..e9ba5b2 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -6,8 +6,6 @@
import com.moral.common.bean.PageBean;
import com.moral.entity.Sensor;
-import java.util.List;
-
public interface SensorService {
List<Sensor> queryAll();
@@ -20,17 +18,34 @@
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>> getSensorByDId(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);
+
+ 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);
+
+ List<String> getSensorKeys();
+
+
}
--
Gitblit v1.8.0