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

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

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

@@ -59,6 +61,7 @@
   }



   @Override

   @Transactional

   public void saveOrUpdateDevice(Device device) {

      ValidateUtil.notNull(device, "param.is.null");

      ValidateUtil.notEmpty(device.getMac(), "param.is.null");

@@ -79,6 +82,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);