From adde1ed1a99622c80a95dea83e294711d295c55c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 08 Sep 2020 14:46:43 +0800
Subject: [PATCH] 微型站5分钟与半小时数据

---
 src/main/java/com/moral/service/SensorService.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index f1b9365..d399d9f 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,21 +18,29 @@
     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>> getSensorByMonitorPointId(String monitor_point_id);
 
     Map<String, String> getSensorsMap(Map<String, Object> parameters) throws Exception;
 
-    Map<String, String> getSensorsMapOnly(String mac);
+    List<Map<String, String>> getSensorsMaps(String mac);
 
-    Map<String, String> getSensorsUnitMap(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