From 57cb796b40a983afcff66edf967e2a1eb513b870 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 14:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/DeviceService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index e40048a..afde4ea 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -3,20 +3,21 @@
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);
List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
Device getDeviceByMac(String mac);
+ PageResult query(Integer orgId, String deviceName,Integer pageSize,Integer pageNo);
+
PageBean queryByPageBean(PageBean pageBean);
void deleteByIds(Integer[] ids);
--
Gitblit v1.8.0