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

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

 src/main/java/com/moral/mapper/SensorMapper.java

@@ -2,6 +2,7 @@

import com.moral.common.mapper.BaseMapper;
import com.moral.entity.Sensor;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;
@@ -9,12 +10,21 @@
public interface SensorMapper extends BaseMapper<Sensor> {
    List<Sensor> selectByVersionId(Integer deviceVersionId);

    List<Sensor> selectByVersionNo(Integer deviceVersionId);
    List<Sensor> selectByVersionNo(Integer deviceVersionNo);

    List<Sensor> selectByVersionNos(@Param("versionNos") List<Integer> versionNos);

    List<Sensor> selectByOrgId(Integer organizationId);

   List<Map<String, Object>> getSensorsByDeviceVersionId(Integer deviceVersionId);
   List<Map<String, Object>> getSensorsByDeviceVersionId(Map<String, Object> parameters);
   
    List<Sensor> getSensorsByCriteria(Map<String, Object> parameters);
    
    Map<String,Object> getSensorBySensorKey(@Param("sensor_key")String sensor_key);
    
    List<Map<String,Object>> getSensorByDeviceId(@Param("id")String id);

    List<Map<String,Object>> getSensorByMonitorPointId(@Param("monitor_point_id")String monitor_point_id);

    List<Sensor> getSensorsByMac(Map<String, Object> parameters);
}