From 8ea24dd5fb6e1b24d3a7ef62a0060ef516f8f759 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 24 May 2018 08:58:16 +0800
Subject: [PATCH] 更新 监测点 数据

---
 src/main/java/com/moral/mapper/DeviceMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 44650c0..d6ffa80 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;
 
@@ -17,5 +18,21 @@
 	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> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devState") String state,@Param("name")String name);
+
+	/**
+	 *
+	 * @param orgId
+	 * @param mpId
+	 * @return ���������������������
+	 */
+	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);
+
+	List<Device> getDevicesByProfession(Map<String, Object> parameters);
 }
\ No newline at end of file

--
Gitblit v1.8.0