From a66d53c3cbfb0024804045f4d795be06089d4f9d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 03 Dec 2020 17:54:15 +0800
Subject: [PATCH] 五分钟表相关代码，平均风向、平局风速工具类
---
src/main/java/com/moral/service/DeviceService.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 39ca627..0789f53 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 {
@@ -68,4 +69,25 @@
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 tab);
+ List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String tab);
+
+ List<Device> getDeviceByCodeAndId(String code,String id);
+
+ String byMacGetOrgId(String mac);
+ //������mac������������������������������������
+ List<Device> getDevice(String macOrName);
+
+ List<Device> getDeviceByCode();
}
--
Gitblit v1.8.0