Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

 src/main/resources/mapper/SensorMapper.xml

@@ -4,13 +4,35 @@
  <resultMap id="BaseResultMap" type="com.moral.entity.Sensor" >
    <id column="id" property="id" jdbcType="INTEGER" />
    <result column="name" property="name" jdbcType="VARCHAR" />
    <result column="key" property="key" jdbcType="VARCHAR" />
    <result column="sensor_key" property="sensorKey" jdbcType="VARCHAR" />
    <result column="upper" property="upper" jdbcType="DOUBLE" />
    <result column="lower" property="lower" jdbcType="DOUBLE" />
    <result column="unit" property="unit" jdbcType="VARCHAR" />
    <result column="description" property="description" jdbcType="VARCHAR" />
  </resultMap>
  <sql id="Base_Column_List" >
    id, name, key, upper, lower, unit, description
    id, name, sensor_key, upper, lower, unit, description
  </sql>
  <select id="selectByVersionId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
    select 
    <include refid="Base_Column_List" />
    from sensor sen
    where EXISTS
    (  select id
       from device_version_sensor dvs
       where sen.id = dvs.sensor_id and dvs.device_version_id = #{deviceVersionId,jdbcType=INTEGER}
    )
  </select>
  
     <select id="getSensorsByDeviceVersionId" resultType="java.util.Map">
      SELECT
         s.* 
      FROM
         device_version_sensor dvs,
         sensor s 
      WHERE
         dvs.sensor_id = s.id 
         AND dvs.device_version_id = #{deviceVersionId}		
   </select>
  
</mapper>