From c97552b69c0af01aadc2580a59a46f58d5545985 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Sep 2020 15:06:00 +0800
Subject: [PATCH] B/S登陆以及测试接口上传

---
 src/main/java/com/moral/service/DeviceService.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 8181d0a..cc47109 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -7,6 +7,7 @@
 import com.moral.common.bean.PageBean;
 import com.moral.common.bean.PageResult;
 import com.moral.entity.Device;
+import com.moral.entity.DeviceAndWind;
 import com.moral.entity.DeviceProperty;
 
 public interface DeviceService {
@@ -56,4 +57,31 @@
 
 	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