From 8efcc21de04bd7f7d784dac97e86e76e1a3ab930 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:47:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DeviceMapper.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 44650c0..bf67ff6 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,14 @@
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);
+
+ List<Device> getDevicesByProfession(Map<String, Object> parameters);
}
\ No newline at end of file
--
Gitblit v1.8.0