From ed28f15efe490b59126545de188a325ddb06af39 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Nov 2020 13:39:25 +0800
Subject: [PATCH] 大屏设备数据导出excel接口更新
---
src/main/java/com/moral/mapper/DeviceMapper.java | 8 +++++---
1 files changed, 5 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..8135b01 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,7 @@
List<Device> getDeviceByCodeAndId(@Param("code") String code, @Param("id") String id);
+ List<Map<String, Object>> getDevicesByMpId(int mpId);
+
String byMacGetOrgId(String mac);
}
\ No newline at end of file
--
Gitblit v1.8.0