guoshilong
2024-01-30 20ca9c36f000f894af9d09cdaf3bd034797dedee
大坝安全监测业务一张图接口优化
2 files modified
60 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml 54 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java 6 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -4139,54 +4139,6 @@
    <select id="damResInfoCountSy" resultType="cn.gistack.sm.damSecurity.vo.DamStatisticsRes">
<!--        SELECT-->
<!--            base.total,-->
<!--            base.errorNum,-->
<!--            (base.total-base.errorNum) as normalNum,-->
<!--            base.typeName,-->
<!--            base.type FROM (-->
<!--                SELECT-->
<!--                COUNT(*) total,-->
<!--                '渗压' AS typeName ,-->
<!--                '1' AS type,-->
<!--                (SELECT COUNT(*) FROM-->
<!--                (-->
<!--                SELECT DAM_ID FROM YWXT.NKY_ALARM_GET temp-->
<!--                LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = temp.dam_id-->
<!--                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"-->
<!--                WHERE-->
<!--                TYPE = 1-->
<!--                AND DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()-->
<!--                <if test=" adCode!= null and adCode !='' ">-->
<!--                    AND (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})-->
<!--                </if>-->
<!--                GROUP BY DAM_ID-->
<!--                )-->
<!--                ) errorNum-->
<!--                FROM-->
<!--                (-->
<!--                SELECT-->
<!--                distinct (dri."res_cd")-->
<!--                FROM-->
<!--                sjzt_dw."dim_res_info_a" dri-->
<!--                LEFT JOIN sjzt_ods."dsm_spg_spprmp" dss ON dri."oth_reg_cd" = dss."rscd"-->
<!--                LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = dri."res_cd"-->
<!--                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"-->
<!--                where dss."rscd" is not null-->
<!--                <if test=" adCode!= null and adCode !='' ">-->
<!--                    AND (province."ad_code" =#{adCode} or city."ad_code" = #{adCode} or county."ad_code" = #{adCode})-->
<!--                </if>-->
<!--                )-->
<!--        )base-->
        SELECT '1' as type,'渗压' as typeName, SUM(TMP.allNum) total,sum(TMP.errorNum) errorNum,sum(normalNum) normalNum FROM (
        select "ad_code","ad_name",allNum,errorNum,allNum-errorNum normalNum from (
@@ -4197,7 +4149,7 @@
        FROM ywxt.NKY_ALARM_GET NAG
        where
                        TYPE = 1
                        AND DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()
                        AND time>= CURDATE()
        group by NAG.dam_id
        ) NAG
        left join sjzt_md."att_res_base" res on (res."guid" = NAG.dam_id)
@@ -4354,7 +4306,7 @@
        select max(NAG.dam_id) dam_id
        FROM ywxt.NKY_ALARM_GET NAG
        where TYPE = 2
        AND DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()
        AND time>= CURDATE()
        group by NAG.dam_id
        ) NAG
        left join sjzt_md."att_res_base" res on (res."guid" = NAG.dam_id)
@@ -4503,7 +4455,7 @@
        select max(NAG.dam_id) dam_id
        FROM ywxt.NKY_ALARM_GET NAG
        where         (TYPE = 3 or type = 4 or type = 5)
        AND DATE_FORMAT(time,'%Y-%m-%d')>= CURDATE()
        AND time>= CURDATE()
        group by NAG.dam_id
        ) NAG
        left join sjzt_md."att_res_base" res on (res."guid" = NAG.dam_id)
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -179,9 +179,9 @@
        DamStatisticsRes sy = damSecurityMapper.damResInfoCountSy(adCode); //7s
        DamStatisticsRes sl = damSecurityMapper.damResInfoCountSl(adCode); //3s
        DamStatisticsRes wy = damSecurityMapper.damResInfoCountWy(adCode);//7s
        DamStatisticsRes sy = damSecurityMapper.damResInfoCountSy(adCode);
        DamStatisticsRes sl = damSecurityMapper.damResInfoCountSl(adCode);
        DamStatisticsRes wy = damSecurityMapper.damResInfoCountWy(adCode);
        list.add(sy);
        list.add(sl);