Merge remote-tracking branch 'origin/master'

fengxiang

2017-12-22 3e2436955a5daf512098dc879c470ee88ce003eb

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

@@ -3,9 +3,17 @@
import java.util.List;

import java.util.Map;



import com.moral.entity.Device;



public interface DeviceService {



   Map<String, Object> getDeviceStatesByAccount(Map<String, Object> parameters);



   List<Map<String, Object>> getSensorsByDevice(String mac);



   void saveOrUpdateDevice(Device device);



   List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);



   Device getDeviceByMac(String mac);

}