From ed28f15efe490b59126545de188a325ddb06af39 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Nov 2020 13:39:25 +0800
Subject: [PATCH] 大屏设备数据导出excel接口更新

---
 src/main/java/com/moral/service/DeviceService.java |   14 ++++++++++++++
 1 files changed, 14 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..06e5674 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,17 @@
 	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 tab);
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String tab);
+
+	List<Device> getDeviceByCodeAndId(String code,String id);
+
+	String byMacGetOrgId(String mac);
 }

--
Gitblit v1.8.0