From 22eb0d07b7230bfdb9542a3d6d24d5163b14c5ac Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Aug 2020 16:19:44 +0800
Subject: [PATCH] 预测数据中加入经纬度字段

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index b2bd249..e396c9a 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -7,6 +7,7 @@
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Device;
 
+import com.moral.entity.DeviceAndWind;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.entity.Example;
 
@@ -55,5 +56,19 @@
 
 	List<Device> selectDevicesAll(Map<String, Object> params);
 
-	List<Device> getDeviceListByMonitorPointIds(List<Integer> id);
+	List<DeviceAndWind> getAllDevice();
+
+	List<String> getAllMac();
+
+	Device byMacGetDevice(@Param("mac") String mac);
+
+	DeviceAndWind getDeviceAndWindByMac(@Param("mac") String mac,@Param("time") String time,
+										@Param("table") String table);
+
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(@Param("id") int id,@Param("time") String time,
+													@Param("table") String table);
+
+	List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
+
+	Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0