From 298f89f02b65783ba5cb79cf57f4fd097868ee5b Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 16 Nov 2020 09:30:54 +0800
Subject: [PATCH] monitor平均值导出数据

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 3e19f58..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);
 
@@ -86,5 +86,14 @@
 
     List<Device> getDeviceByCodeAndId(@Param("code") String code, @Param("id") String id);
 
+    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