From 72bfd6cfe47b48a183ea3795054dabdcffb543d7 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 13 Aug 2020 09:22:23 +0800
Subject: [PATCH] 风场图update
---
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 917c31e..8b7cb04 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 {
@@ -61,4 +62,25 @@
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);
+
+ DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table);
}
--
Gitblit v1.8.0