From 4ffcc9ca554e2b541d5e00c2d61d5835708e2190 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 07 Nov 2018 10:14:23 +0800
Subject: [PATCH] 获取 组织下的监控点和设备数据

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index b0f9d49..9f29d35 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,17 +1,49 @@
 package com.moral.service;
 
+import java.util.Date;
 import java.util.List;
 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);
 
 	List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
+
+    Device getDeviceByMac(String mac, boolean fromCache);
+
+    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);
+
+	int countByExample(PageBean pageBean);
+
+	PageBean queryByPageBean(PageBean pageBean);
+
+	void deleteByIds(Integer[] ids);
+
+    void addOrModify(Device device);
+
+	List<Map> countByTimes(Date start, Date end, String format);
+
+	List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
+
+	List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
+
+	Device queryById(Integer id);
+
+	List<Device> getDevicesByProfessionId(Map<String, Object> parameters);
+
+	List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);
+
+    Map<String,Long> queryDeviceStateSummary(Integer orgId);
 }

--
Gitblit v1.8.0