Merge remote-tracking branch 'origin/master'

沈斌

2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -1,12 +1,12 @@
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;

@@ -17,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 {

@@ -26,7 +27,7 @@


   @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");

@@ -56,11 +57,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");

@@ -73,6 +69,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());

@@ -99,4 +96,62 @@
      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);

         }



      }

   }



   @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);

   }



}