From 7b24f406659d6fd8692eda6b21b5b6d95f416e2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 14:19:39 +0800
Subject: [PATCH] 安全跨域设置

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index f4ce1f4..44650c0 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -7,10 +7,15 @@
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Device;
+import tk.mybatis.mapper.entity.Example;
 
 public interface DeviceMapper extends BaseMapper<Device>{
 
 	List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);
-
+    List<Device>  selectWithRelationData(Example example);
 	List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);
+	List<String> getDeviceMacByMonitorPointAndDeviceVersion(@Param("monitorPointId")Integer monitorPointId,@Param("deviceVersionId")Integer deviceVersionId);
+
+	List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);
+	List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);
 }
\ No newline at end of file

--
Gitblit v1.8.0