From 9757518476af8f4545a071b019680bd714747e59 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 22:24:21 +0800
Subject: [PATCH] updated

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index ee2a7f9..04756d4 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -3,17 +3,21 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Device;
-import com.moral.entity.DeviceExample;
+import tk.mybatis.mapper.entity.Example;
 
-@Mapper
-public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer>{
+public interface DeviceMapper extends BaseMapper<Device>{
 
 	List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);
 
-	List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);
+	List<Device>  selectWithRelationData(Example example);
+
+	List<String> getDeviceMacByMonitorPointAndDeviceVersion(@Param("monitorPointId")Integer monitorPointId,@Param("deviceVersionId")Integer deviceVersionId);
+
+	List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0