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 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 707b487..a4501a4 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -4,13 +4,12 @@
 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 {
 
 	Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters);
-
-	List<Map<String, Object>> getSensorsByDevice(String mac);
 
 	void saveOrUpdateDevice(Device device);
 
@@ -18,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);
 
@@ -27,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