From 1975c595cea467a97bd3ac34571d5051405a12a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 09:27:05 +0800
Subject: [PATCH] 地图 相关修改

---
 src/main/java/com/moral/mapper/DeviceMapper.java |   15 ++++++++++++++-
 1 files changed, 14 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..b0a8ae8 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -1,5 +1,6 @@
 package com.moral.mapper;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -7,10 +8,22 @@
 
 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);
+	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);
+	Integer getDeviceCountByRegion(Map<String, Object> parameters);
+	List<Map> countByTimes(@Param("start")Date start,@Param("end")Date end,@Param("format")String format);
 }
\ No newline at end of file

--
Gitblit v1.8.0