From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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