From 024e698be593014fff2f16112f46ab144257a1f9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 09:42:21 +0800
Subject: [PATCH] 地图相关 mac 大小写保持一致性
---
src/main/java/com/moral/mapper/DeviceMapper.java | 21 ++++++++++++++++-----
1 files changed, 16 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..c96da66 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -3,12 +3,23 @@
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> {
- 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<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);
}
\ No newline at end of file
--
Gitblit v1.8.0