From 35bfe435d09808e451de0f766f7660f91bdd35be Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 04 Apr 2019 15:00:45 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index bf67ff6..2d4ae0f 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -8,6 +8,7 @@
 
 import com.moral.common.mapper.BaseMapper;
 import com.moral.entity.Device;
+
 import tk.mybatis.mapper.entity.Example;
 
 public interface DeviceMapper extends BaseMapper<Device>{
@@ -19,8 +20,15 @@
 
 	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> selectByOrgIdAndDevName(@Param("orgId")Integer orgId, @Param("orgIds")List<Integer> orgIds,@Param("devState") String state,@Param("name")String name);
+
+	/**
+	 *
+	 * @param orgId
+	 * @param mpId
+	 * @return ���������������������
+	 */
+	List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("orgIds")List<Integer> orgIds,@Param("mpId")Integer mpId);
 	List<Device> selectByMap(Map<String, Object> params);
 	Device selectWithOrgIdsByMac(String mac);
 	List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);
@@ -28,4 +36,10 @@
 	List<Map> countByTimes(@Param("start")Date start,@Param("end")Date end,@Param("format")String format);
 
 	List<Device> getDevicesByProfession(Map<String, Object> parameters);
+
+	List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);
+	List<Map<String, Object>> getDevicesStateByRegion(Map<String, Object> parameters);
+
+	List<Device> getDeviceList(Example example);
+	String getLimitDataByDevice(Map<String, Object> parameters);
 }
\ No newline at end of file

--
Gitblit v1.8.0