From 2b3c06ae70b16b83063158d092094619579a4d7b Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 27 Oct 2020 14:40:12 +0800
Subject: [PATCH] 风场更新

---
 src/main/java/com/moral/service/DeviceService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 8064130..06e5674 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -80,8 +80,10 @@
 
 	Device byMacGetDevice(String mac);
 
-	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String time,String tab);
-	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String time,String tab);
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String tab);
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String tab);
 
-	DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table);
+	List<Device> getDeviceByCodeAndId(String code,String id);
+
+	String byMacGetOrgId(String mac);
 }

--
Gitblit v1.8.0