From 186ec9dcec258b3cead27c6874a828b9f48e1c8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 28 Aug 2020 13:55:15 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 5ffb2ac..8064130 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 {
@@ -72,4 +73,15 @@
 	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);
+
+	DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table);
 }

--
Gitblit v1.8.0