From b4aa377b5e7898cd2ef018cc385a19af67a56839 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:58 +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 | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index afde4ea..a4501a4 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -4,6 +4,7 @@
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 {
@@ -16,7 +17,10 @@
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);
@@ -25,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