From 4a41bd4e105385b5460e5a81c8b67e5f701a262b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 04 May 2018 08:55:13 +0800
Subject: [PATCH] 首页 工作台

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index a4501a4..2c5be38 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -1,5 +1,6 @@
 package com.moral.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import com.moral.common.bean.PageBean;
@@ -22,12 +23,16 @@
 
     PageResult query(Integer orgId, Integer mpId, Integer pageSize, Integer pageNo);
 
-    PageBean queryByPageBean(PageBean pageBean);
+	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);

--
Gitblit v1.8.0