From 1f5d96b654079484dd03de0c6d38559075e88bdb Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 14 Nov 2018 15:52:16 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/DeviceService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index a4501a4..9f29d35 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;
@@ -15,20 +16,34 @@
List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);
- Device getDeviceByMac(String mac);
+ 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);
- 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);
+
+ 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