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/DeviceService.java |   46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 45 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 0074580..cc47109 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -3,10 +3,12 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
 import com.moral.common.bean.PageBean;
 import com.moral.common.bean.PageResult;
-import com.moral.common.bean.ResultBean;
 import com.moral.entity.Device;
+import com.moral.entity.DeviceAndWind;
+import com.moral.entity.DeviceProperty;
 
 public interface DeviceService {
 
@@ -40,4 +42,46 @@
 	List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
 
 	Device queryById(Integer id);
+
+	List<Device> getDevicesByProfessionId(Map<String, Object> parameters);
+
+	List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);
+
+    Map<String,Long> queryDeviceStateSummary(Integer orgId);
+
+	void saveOrUpdate(Device device, DeviceProperty deviceProperty);
+
+	PageBean getDeviceList(PageBean pageBean);
+
+	void offLinToMaintenance(Map<String, Object> parameters);
+
+	void saveOrUpdate4Mobile(Device device, DeviceProperty deviceProperty);
+
+	String getLimitDataByDevice(Map<String, Object> parameters);
+
+	Device getDeviceByLongitudeAsc(String mac);
+
+    List<String> getMacsByOrganizationId(List<Object> organizationIdList);
+
+	//������������������
+	List<Device> getDeviceById1(int id);
+	//������������������
+	List<Device> getDeviceById2(int id);
+	//������������������
+	List<Device> getDeviceById3(int id);
+
+	List<Device> queryDevice(Map<String,Object> map);
+
+	Map<String, Object> getAllFieldByMac(Map<String, Object> parameters);
+
+	List<DeviceAndWind> getAllDevice();
+
+	List<String> getAllMac();
+
+	Device byMacGetDevice(String mac);
+
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String time,String tab);
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String time,String tab);
+
+
 }

--
Gitblit v1.8.0