From af8dd6eccb0aab770246ae44db1cde4e531416c5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DeviceMapper.java | 4 +++-
1 files changed, 3 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..1eba557 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -7,10 +7,12 @@
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<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);
}
\ No newline at end of file
--
Gitblit v1.8.0