Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-05 86916a5b7c8ed98221c03e440a9aad0f38109263

 src/main/java/com/moral/service/DeviceService.java

@@ -38,4 +38,12 @@
   List<Device> getDevicesByMonitorPointId(Integer monitorPointId);



   List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);



   Device queryById(Integer id);



   List<Device> getDevicesByProfessionId(Map<String, Object> parameters);



   List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);



    Map<String,Long> queryDeviceStateSummary(Integer orgId);

}