From b41f303340d8c21dad9e1b2fd798a0957e7fd7d1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 01 Dec 2017 09:32:32 +0800
Subject: [PATCH] 大屏 接口
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 6375262..f63cd82 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -21,15 +21,15 @@
private AccountService accountService;
@Override
- public Map<String, Object> getDeviceStates(Map<String, Object> parameters) {
+ public Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters) {
Map<String, Object> result = new HashMap<String, Object>();
accountService.setOrgIdsByAccount(parameters);
- List<Map<String, Object>> list = deviceMapper.getDeviceStates(parameters);
+ List<Map<String, Object>> list = deviceMapper.getDeviceStatesByAccount(parameters);
Long all = 0L, normal = 0L, abnormal = 0L, stop = 0L;
for (Map<String, Object> map : list) {
Long count = (Long) map.get("count");
all += count;
- switch ((Integer) map.get("state")) {
+ switch (Integer.valueOf((String) map.get("state"))) {
case 0:
normal = count;
break;
@@ -46,4 +46,10 @@
result.put("stop", stop);
return result;
}
+
+ @Override
+ public List<Map<String, Object>> getSensorsByDevice(String mac) {
+ return deviceMapper.getSensorsByDevice(mac);
+ }
+
}
--
Gitblit v1.8.0