From f11131f58810e3b021dacc4c233be79e53e069a5 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 26 Apr 2018 15:34:14 +0800
Subject: [PATCH] 修改ftp服务器

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 0cb3198..a4501a4 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -3,6 +3,8 @@
 import java.util.List;
 import java.util.Map;
 import com.moral.common.bean.PageBean;
+import com.moral.common.bean.PageResult;
+import com.moral.common.bean.ResultBean;
 import com.moral.entity.Device;
 
 public interface DeviceService {
@@ -15,6 +17,11 @@
 
 	Device getDeviceByMac(String mac);
 
+	List<Device> query(Map<String,Object> map);
+    PageResult query(Integer orgId, String deviceName,Integer pageSize,Integer pageNo);
+
+    PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo);
+
     PageBean queryByPageBean(PageBean pageBean);
 
 	void deleteByIds(Integer[] ids);
@@ -22,4 +29,6 @@
     void addOrModify(Device device);
 
 	List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
+
+	List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
 }

--
Gitblit v1.8.0