From aba833c7e94483639995f269aa00954e0bf4ade3 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 18 Jan 2018 15:30:45 +0800
Subject: [PATCH] 设备管理

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index d286c8f..ded40ee 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,13 +1,14 @@
 package com.moral.service.impl;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Resource;
 
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
+import com.moral.common.util.ExampleUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import com.github.pagehelper.PageHelper;
@@ -16,6 +17,7 @@
 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 {
@@ -25,9 +27,10 @@
 
 	@Resource
 	private AccountService accountService;
-
+    private Class ENTITY_CLASS = Device.class;
 	@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);
@@ -59,6 +62,7 @@
 	}
 
 	@Override
+	@Transactional
 	public void saveOrUpdateDevice(Device device) {
 		ValidateUtil.notNull(device, "param.is.null");
 		ValidateUtil.notEmpty(device.getMac(), "param.is.null");
@@ -70,6 +74,7 @@
 		if (ObjectUtils.isEmpty(queryDevice)) {
 			device.setCreateTime(operateDate);
 			device.setState("4");
+			device.setIsDelete(Constants.IS_DELETE_FALSE);
 			deviceMapper.insertSelective(device);
 		}else {
 			device.setId(queryDevice.getId());
@@ -79,6 +84,7 @@
 
 	@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);
@@ -95,4 +101,39 @@
 		return device;
 	}
 
+	@Override
+	public PageBean queryByPageBean(PageBean pageBean) {
+		Example example = ExampleUtil.generateExample(ENTITY_CLASS,pageBean);
+		List<Example.Criteria> criteriaList = example.getOredCriteria();
+		if(criteriaList!=null&&criteriaList.size()>0){
+			for(Example.Criteria cri : criteriaList){
+				cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
+			}
+		}else {
+			example.or().andNotEqualTo("isDelete",Constants.IS_DELETE_TRUE);
+		}
+		if(pageBean.getPageSize()>0){
+			PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());
+		}
+		List<Device> organizationList = deviceMapper.selectWithRelationData(example);
+		return new PageBean(organizationList);
+	}
+
+	@Override
+	public void deleteByIds(Integer[] ids) {
+		Device device = new Device();
+		device.setIsDelete(Constants.IS_DELETE_TRUE);
+		if(ids!=null&&ids.length>0){
+			if(ids.length==1){
+				device.setId(ids[0]);
+				deviceMapper.updateByPrimaryKeySelective(device);
+			}else{
+				Example example = new Example(ENTITY_CLASS);
+				example.or().andIn("id", Arrays.asList(ids));
+				deviceMapper.updateByExampleSelective(device,example);
+			}
+
+		}
+	}
+
 }

--
Gitblit v1.8.0