From d6cb70708e6bb9e18cbc2fbc0034f3dd998fcd38 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 15 Sep 2020 14:49:07 +0800
Subject: [PATCH] 获取城市天气,aqi更新

---
 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 99b1786..f5f97ac 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,7 +56,21 @@
 
 	List<Device> selectDevicesAll(Map<String, Object> params);
 
-	List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
+	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);
+	DeviceAndWind byMacGetDeviceAndWind(@Param("mac") String mac,@Param("time") String time, @Param("table") String table);
+
+	List<String> getMacsByMonitorPointIds(List<Integer> list);
 
 	Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
+
+	List getDeviceByCode(Map<String, Object> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0