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

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 src/main/resources/mapper/SensorUnitMapper.xml

@@ -35,4 +35,28 @@
   AND su.is_delete=0
   AND mp.id = #{id}
  </select>
   <select id="getSensorUnitByDeviceMac" resultType="java.util.Map">
      SELECT
         su.* ,
         s.sensor_key 
      FROM
         device d,
         sensor_unit su,
         organization_sensor_unit osu,
         monitor_point mp,
         device_version_sensor dvs,
         sensor s 
      WHERE
         d.monitor_point_id = mp.id 
         AND su.is_delete = '0'
         AND mp.organization_id = osu.organization_id 
         AND osu.sensor_unit_id = su.id 
         AND su.sensor_id = s.id 
         AND d.device_version_id = dvs.device_version_id 
         AND su.sensor_id = dvs.sensor_id 
         AND d.mac = #{mac}
         <if test="sensorKey != null">
            AND s.sensor_key = #{sensorKey}
         </if>
   </select>
</mapper>