From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
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 78c2ae8..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 {
@@ -70,4 +71,17 @@
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