From f1e25082a58c8cb57dd45d226d3a94f4af4a0677 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 5623fd7..0462992 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -1,12 +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.github.pagehelper.Page;
+import com.moral.common.bean.Constants;
+import com.moral.common.bean.PageBean;
+import com.moral.common.bean.PageResult;
+import com.moral.common.util.ExampleUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -17,6 +19,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 {
@@ -26,9 +29,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);
@@ -55,11 +59,6 @@
}
@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");
@@ -72,6 +71,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());
@@ -81,6 +81,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);
@@ -97,4 +98,74 @@
return device;
}
+ @Override
+ public PageResult query(Integer orgId, String deviceName, Integer pageSize, Integer pageNo) {
+ if(!ObjectUtils.isEmpty(pageSize)&&!ObjectUtils.isEmpty(pageNo)){
+ PageHelper.startPage(pageNo,pageSize);
+ }
+ List list = deviceMapper.selectByOrgIdAndDevName(orgId,deviceName);
+ if(list instanceof Page){
+ return new PageResult(((Page) list).getTotal(),list);
+ }
+ return new PageResult(null,list);
+ }
+
+ @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);
+ }
+
+ }
+ }
+
+ @Override
+ public void addOrModify(Device device){
+ try{
+ if(device.getId()==null){
+ device.setIsDelete(Constants.IS_DELETE_FALSE);
+ deviceMapper.insertSelective(device);
+ }else{
+ deviceMapper.updateByPrimaryKeySelective(device);
+ }
+ }
+ catch (Exception ex){
+ throw ex;
+ }
+ }
+
+ @Override
+ public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
+ Device device = new Device();
+ device.setMonitorPointId(monitorPointId);
+ device.setIsDelete(Constants.IS_DELETE_FALSE);
+ return deviceMapper.select(device);
+ }
+
}
--
Gitblit v1.8.0