From 57ac79239ce487db3447345a349296e9493248ce Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 11:02:22 +0800
Subject: [PATCH] 恢复大屏调用接口

---
 src/main/java/com/moral/mapper/DeviceMapper.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 00b8fbc..a30d2e1 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -71,12 +71,12 @@
 
     Device byMacGetDevice(@Param("mac") String mac);
 
-    DeviceAndWind getDeviceAndWindByMac(@Param("mac") String mac, @Param("time") String time,
+    DeviceAndWind getDeviceAndWindByMac(@Param("mac") String mac,
                                         @Param("table") String table);
 
-    List<DeviceAndWind> byMonitorIdGetDeviceAndWind(@Param("id") int id, @Param("time") String time, @Param("table") String table);
+    List<DeviceAndWind> byMonitorIdGetDeviceAndWind(@Param("id") int id, @Param("table") String table);
 
-    DeviceAndWind byMacGetDeviceAndWind(@Param("mac") String mac, @Param("time") String time, @Param("table") String table);
+    DeviceAndWind byMacGetDeviceAndWind(@Param("mac") String mac, @Param("table") String table);
 
     List<String> getMacsByMonitorPointIds(List<Integer> list);
 
@@ -89,4 +89,11 @@
     List<Map<String, Object>> getDevicesByMpId(int mpId);
 
     String byMacGetOrgId(String mac);
+
+    List<Device> getDevice(String macOrName);
+
+
+    List<Device> getDeviceByCityCode();
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0