From 4c872cea75d5b3c3832f0f0796ba727e8f91168d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 21 Oct 2020 15:03:50 +0800
Subject: [PATCH] 增加获取单台设备五分钟平均值以及沧州环保局下属设备只显示十个参数

---
 src/main/java/com/moral/mapper/DeviceMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 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..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,5 +56,21 @@
 
 	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);
+	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