From bf07dc7110da782eeb655371d6d6c11818c1b33f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 16:43:46 +0800
Subject: [PATCH] 设备模块代码恢复

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index db24cfc..afde4ea 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -3,13 +3,12 @@
 import java.util.List;
 import java.util.Map;
 import com.moral.common.bean.PageBean;
+import com.moral.common.bean.PageResult;
 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);
 
@@ -17,9 +16,13 @@
 
 	Device getDeviceByMac(String mac);
 
+    PageResult query(Integer orgId, String deviceName,Integer pageSize,Integer pageNo);
+
     PageBean queryByPageBean(PageBean pageBean);
 
 	void deleteByIds(Integer[] ids);
 
     void addOrModify(Device device);
+
+	List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
 }

--
Gitblit v1.8.0