Merge remote-tracking branch 'origin/master'

沈斌

2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487

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

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

@@ -151,5 +146,12 @@
      }

   }



   @Override

   public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {

      Device device = new Device();

      device.setMonitorPointId(monitorPointId);

      device.setIsDelete(Constants.IS_DELETE_FALSE);

      return deviceMapper.select(device);

   }



}