Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml

@@ -932,6 +932,35 @@



    <select id="alarmResCountByZt" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics">
        SELECT
        arb."center_long" AS longitude,
        arb."center_lat" AS latitude,
        arb."name" as resName,
        sar.reservoir_number resCd,
        abb."code" AS basCode,
        abb."name" AS basName
        FROM
        (

        select sar.* from YWXT.sm_alarm_record sar
        left join ywxt.sm_alarm_rule b on (sar.alarm_rule_id = b.id)
        where sar.create_time >= #{dam.startTime} and sar.create_time &lt;= #{dam.endTime}
        and b.create_alarm_type not like '%缺失%'
        and (b.type = '渗压监测' or b.type = '变形监测' or b.type = '渗流监测')
        and (b.ALARM_LEVEL = '红色预警' or b.ALARM_LEVEL = '橙色预警')
        ) sar
        LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = sar.reservoir_number
        LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = arb."interior_ad_guid"
        LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
        LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
        LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"

        LEFT JOIN SJZT_MD."rel_res_bas_loc" rrbl ON rrbl."res_guid" = sar.reservoir_number
        LEFT JOIN SJZT_MD."att_bas_base" abb ON abb."code" = rrbl."bas_guid"
        LEFT JOIN SJZT_MD."att_bas_base" pabb ON abb."p_code" = pabb."code"
    </select>

    <select id="alarmResCount" resultType="cn.gistack.sm.damSecurity.vo.DamStationStatistics">
        SELECT
        arb."center_long" AS longitude,