Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-09-03 ca66f2f175e6b66eda193ce58439515a9484e6b7

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

@@ -27,4 +27,10 @@
    public List<Sensor> getAllSensors();
    
    Map<String, Object> getSensorBySensorKey(String SensorKey);
    
    List<Map<String,Object>> getSensorByDeviceId(String id);
    
    List<Map<String,Object>> getSensorByMonitorPointId(String monitor_point_id);

    Map<String, String> getSensorsMap(Map<String, Object> parameters) throws Exception;
}