From 00e38ff225eb948f5234934afc01aa54c94e0de6 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:29:36 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 8dd670a..f5f97ac 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -4,10 +4,11 @@
 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 com.moral.entity.DeviceAndWind;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.entity.Example;
 
 public interface DeviceMapper extends BaseMapper<Device>{
@@ -38,4 +39,38 @@
 
 	List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);
 	List<Map<String, Object>> getDevicesStateByRegion(Map<String, Object> parameters);
+
+	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<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