From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/SensorService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index 1eb869d..0a99483 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,11 +18,32 @@
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);
+
+ 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