From 8fb013a6d6707929799e9f7a8a82f311cbca29ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Dec 2020 14:47:04 +0800
Subject: [PATCH] update大屏年,月数据查询接口

---
 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..4cedb72 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();
+
+    List<Device> getDevicesByAccountId(String id);
 }
\ No newline at end of file

--
Gitblit v1.8.0