From 2bcbf240bd4419d01232967915295df61a8e1d84 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 19 Oct 2020 13:20:34 +0800
Subject: [PATCH] 删除测试websocket
---
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..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 {
@@ -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);
+
+
}
--
Gitblit v1.8.0