From 8ad473d0e87886501a73cc408ebe7efbff25f373 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:16:01 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 9e775bd..7c27be8 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,8 +1,19 @@
 package com.moral.service;
 
+import java.util.List;
 import java.util.Map;
+
+import com.moral.entity.Device;
 
 public interface DeviceService {
 
-	Map<String, Object> getDeviceStates(Map<String, Object> parameters);
+	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);
 }

--
Gitblit v1.8.0