From 1bbeba412a6880049ea9a8a649bfa4dbbf29ad44 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Sep 2020 11:28:08 +0800
Subject: [PATCH] websocket关闭测试
---
src/main/java/com/moral/service/DeviceService.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 8123b72..cc47109 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,13 +1,14 @@
package com.moral.service;
-import com.moral.common.bean.PageBean;
-import com.moral.common.bean.PageResult;
-import com.moral.entity.Device;
-import com.moral.entity.DeviceProperty;
-
import java.util.Date;
import java.util.List;
import java.util.Map;
+
+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 {
@@ -59,4 +60,28 @@
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