From cc31761e9ccadea2914af450b5414824ba983f38 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 22 Jun 2020 16:58:08 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index b0a8ae8..fdd805e 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,11 +20,28 @@
 
 	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);
 	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);
+
+	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);
+
+    List<String> getMacsByOrganizationId(@Param("organizationIdList") List<Object> organizationIdList);
 }
\ No newline at end of file

--
Gitblit v1.8.0