From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
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