From ff93ecd1f2cb4c5ae8459430dd3e09fedad0e3ea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 13:53:04 +0800
Subject: [PATCH] device 增加 过滤 为删除条件 修复

---
 src/main/java/com/moral/service/DeviceService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 2c5be38..e05acea 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -16,7 +16,9 @@
 
 	List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
 
-	Device getDeviceByMac(String mac);
+    Device getDeviceByMac(String mac, boolean fromCache);
+
+    Device getDeviceByMac(String mac);
 
 	List<Device> query(Map<String,Object> map);
     PageResult query(Integer orgId, String deviceName,Integer pageSize,Integer pageNo);
@@ -36,4 +38,8 @@
 	List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
 
 	List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
+
+	Device queryById(Integer id);
+
+	List<Device> getDevicesByProfessionId(Map<String, Object> parameters);
 }

--
Gitblit v1.8.0