From 530aeddc3a2fc1310f68f6c76c82fb4aa99145b4 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 28 Mar 2018 14:31:53 +0800
Subject: [PATCH] 报表 优化
---
src/main/java/com/moral/service/DeviceService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 707b487..a4501a4 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -4,13 +4,12 @@
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);
@@ -18,7 +17,10 @@
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);
@@ -27,4 +29,6 @@
void addOrModify(Device device);
List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
+
+ List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);
}
--
Gitblit v1.8.0