From b28a5002a58d8d0b37082da12e5b218f0951de47 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 04 Dec 2017 16:46:44 +0800
Subject: [PATCH] 更新
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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..828e58d 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -4,7 +4,8 @@
import java.util.List;
import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+
import org.springframework.stereotype.Service;
import com.moral.mapper.DeviceMapper;
@@ -14,22 +15,22 @@
@Service
public class DeviceServiceImpl implements DeviceService {
- @Autowired
+ @Resource
private DeviceMapper deviceMapper;
- @Autowired
+ @Resource
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 +47,10 @@
result.put("stop", stop);
return result;
}
+
+ @Override
+ public List<Map<String, Object>> getSensorsByDevice(String mac) {
+ return deviceMapper.getSensorsByDevice(mac);
+ }
+
}
--
Gitblit v1.8.0