From 8095e8cf7538ff2e5d3f146b7b7facb76584df19 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 20 Dec 2017 11:52:11 +0800
Subject: [PATCH] updated
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 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..982bbe0 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,12 +1,19 @@
package com.moral.service.impl;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import com.github.pagehelper.PageHelper;
+import com.moral.common.util.ValidateUtil;
+import com.moral.entity.Device;
import com.moral.mapper.DeviceMapper;
import com.moral.service.AccountService;
import com.moral.service.DeviceService;
@@ -14,22 +21,23 @@
@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) {
+ ValidateUtil.notNull(parameters.get("accountId"), "param.is.null");
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 +54,49 @@
result.put("stop", stop);
return result;
}
+
+ @Override
+ public List<Map<String, Object>> getSensorsByDevice(String mac) {
+ return deviceMapper.getSensorsByDevice(mac);
+ }
+
+ @Override
+ @Transactional
+ public void saveOrUpdateDevice(Device device) {
+ ValidateUtil.notNull(device, "param.is.null");
+ ValidateUtil.notEmpty(device.getMac(), "param.is.null");
+ Device queryDevice = new Device();
+ queryDevice.setMac(device.getMac());
+ queryDevice = deviceMapper.selectOne(queryDevice);
+ Date operateDate = new Date();
+ device.setInstallTime(operateDate);
+ if (ObjectUtils.isEmpty(queryDevice)) {
+ device.setCreateTime(operateDate);
+ device.setState("4");
+ deviceMapper.insertSelective(device);
+ }else {
+ device.setId(queryDevice.getId());
+ deviceMapper.updateByPrimaryKeySelective(device);
+ }
+ }
+
+ @Override
+ public List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize) {
+ ValidateUtil.notNull(uid, "param.is.null");
+ Device device = new Device();
+ device.setOperateUserId(uid);
+ PageHelper.startPage(pageIndex, pageSize);
+ List<Device> devices = deviceMapper.select(device);
+ return devices;
+ }
+
+ @Override
+ public Device getDeviceByMac(String mac) {
+ ValidateUtil.notEmpty(mac, "param.is.null");
+ Device device = new Device();
+ device.setMac(mac);
+ device = deviceMapper.selectOne(device);
+ return device;
+ }
+
}
--
Gitblit v1.8.0