From 781c9724dac7d3698161ecb845e55ba1800b8ec1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:46:52 +0800
Subject: [PATCH] mac地址唯一性服务,查询数据行业功能添加。

---
 src/main/java/com/moral/service/DeviceService.java |    6 +++++-
 1 files changed, 5 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..0074580 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,6 @@
 	List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
 
 	List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
+
+	Device queryById(Integer id);
 }

--
Gitblit v1.8.0