Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/SensorUnitMapper.xml

@@ -26,7 +26,7 @@
  </select>
  
  <select id="getSensorsByMonitPointId" resultType="java.util.Map">
     SELECT mp.id,s.sensor_key,su.id,su.sensor_id,su.name,su.rules
     SELECT mp.id,s.sensor_key,s.unit,su.id,su.sensor_id,su.name,su.rules
   FROM monitor_point mp,organization org,organization_sensor_unit osu,sensor_unit su, sensor s
   WHERE mp.organization_id = org.id
   AND org.id = osu.organization_id
@@ -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>