From 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 16:50:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DeviceMapper.java | 19 ++++++++++++++-----
1 files changed, 14 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..852b972 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -3,17 +3,26 @@
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<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);
+ List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("mpId")Integer mpId);
+ List<Device> selectByMap(Map<String, Object> params);
+ Device selectWithOrgIdsByMac(String mac);
+
+ List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);
+
}
\ No newline at end of file
--
Gitblit v1.8.0