From 01329695ebf6eea6576d76825181b2f3833297e8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:12:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/mapper/DeviceMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 34eff69..f4ce1f4 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -3,12 +3,14 @@
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;
-@Mapper
-public interface DeviceMapper extends BaseMapper<Device, DeviceExample, Integer> {
- List<Map<String, Object>> getDeviceStates(Map<String, Object> parameters);
+public interface DeviceMapper extends BaseMapper<Device>{
+
+ List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);
+
+ List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);
}
\ No newline at end of file
--
Gitblit v1.8.0