Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/resources/mapper/AlarmConfigMapper.xml

@@ -103,5 +103,24 @@
    from alarm_config acg
    LEFT JOIN monitor_point mpt on acg.organization_id = mpt.organization_id
    where mpt.id = #{mpId,jdbcType=INTEGER}
    limit 0,1
  </select>
  <select id="selectByDeviceMac" parameterType="java.lang.String" resultMap="BaseResultMap">
    select
    acg.*
    from alarm_config acg
    LEFT JOIN monitor_point mpt on acg.organization_id = mpt.organization_id
    LEFT JOIN device dev on mpt.id = dev.monitor_point_id
    where dev.mac = #{mac,jdbcType=VARCHAR}
    limit 0,1
  </select>
    <select id="getValueByOrganizationId" resultType="java.lang.String">
      select `value`
      from alarm_config
      where organization_id = #{organizationId,jdbcType=INTEGER}
      limit 0,1
    </select>
  <select id="containOrgId" resultType="java.lang.Integer">
    select COUNT(*) from  alarm_config where id=#{orgId}
  </select>
</mapper>