From 8a4fccc993cbef14b83443d91e51e9b74664eab5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:18:46 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 2d4ae0f..99b1786 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -4,11 +4,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Device;
 
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.entity.Example;
 
 public interface DeviceMapper extends BaseMapper<Device>{
@@ -42,4 +41,21 @@
 
 	List<Device> getDeviceList(Example example);
 	String getLimitDataByDevice(Map<String, Object> parameters);
+
+    List<String> getMacsByOrganizationId(@Param("organizationIdList") List<Object> organizationIdList);
+
+	List<Device> getDeviceById1(@Param("id") int id);
+
+	//������������������
+	List<Device> getDeviceById2(@Param("id") int id);
+
+	List<Device> getDeviceById3(@Param("id") int id);
+
+	List<Integer> getHasWindDirAndWindSpeedDeviceVersion();
+
+	List<Device> selectDevicesAll(Map<String, Object> params);
+
+	List<Device> getDeviceListByMonitorPointIds(List<Integer> list);
+
+	Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
 }
\ No newline at end of file

--
Gitblit v1.8.0