Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 ee0e4c362e299f9be9a3859d0c142f26871cacf6

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

@@ -1,5 +1,6 @@
package com.moral.service.impl;



import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

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

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

@@ -53,4 +60,43 @@
      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;

   }



}