From ee0e4c362e299f9be9a3859d0c142f26871cacf6 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index b21b0af..982bbe0 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -8,17 +8,15 @@
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.exception.BusinessException;
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;
-
-import tk.mybatis.mapper.entity.Example;
@Service
public class DeviceServiceImpl implements DeviceService {
@@ -31,6 +29,7 @@
@Override
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.getDeviceStatesByAccount(parameters);
@@ -62,33 +61,42 @@
}
@Override
+ @Transactional
public void saveOrUpdateDevice(Device device) {
- ValidateUtil.notNull(device, "������������������");
- ValidateUtil.notEmpty(device.getMac(), "������������������");
- Example example = new Example(Device.class);
- example.or().andEqualTo("mac",device.getMac());
- List<Device> devices = deviceMapper.selectByExample(example);
+ 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(devices)) {
+ if (ObjectUtils.isEmpty(queryDevice)) {
device.setCreateTime(operateDate);
device.setState("4");
deviceMapper.insertSelective(device);
- }else if (devices.size() > 1) {
- throw new BusinessException("���������������������������������������");
}else {
- device.setId(devices.get(0).getId());
+ device.setId(queryDevice.getId());
deviceMapper.updateByPrimaryKeySelective(device);
}
}
@Override
public List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize) {
- Example example = new Example(Device.class);
- example.or().andEqualTo("operateUserId",uid);
+ ValidateUtil.notNull(uid, "param.is.null");
+ Device device = new Device();
+ device.setOperateUserId(uid);
PageHelper.startPage(pageIndex, pageSize);
- List<Device> devices = deviceMapper.selectByExample(example);
+ 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