From 7f33dd19c55ef3980129ff3034f9eaf89a9bcf58 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 30 Nov 2020 17:27:01 +0800
Subject: [PATCH] 修改monitorPointMapper

---
 src/main/java/com/moral/service/DeviceService.java |   12 +++++++++---
 1 files changed, 9 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..0789f53 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -80,8 +80,14 @@
 
 	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);
+	//������mac������������������������������������
+	List<Device> getDevice(String macOrName);
+
+	List<Device> getDeviceByCode();
 }

--
Gitblit v1.8.0