From 01d77db2f4d991afcd2a9a34213e12a4cdc87d67 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 14 Jun 2018 10:02:26 +0800
Subject: [PATCH] EquDeviceAdapter 增加id
---
src/main/java/com/moral/mapper/DeviceMapper.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index b77c595..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;
@@ -18,13 +19,20 @@
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