From 3c3250c96a13c796aa88f1366b6d278cb95739e5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DeviceMapper.java | 13 +++++++++++--
1 files changed, 11 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..0a934e1 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -19,11 +19,20 @@
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);
}
\ No newline at end of file
--
Gitblit v1.8.0