From 20ca9c36f000f894af9d09cdaf3bd034797dedee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 30 Jan 2024 14:20:00 +0800
Subject: [PATCH] 大坝安全监测业务一张图接口优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml | 54 +++---------------------------------------------------
1 files changed, 3 insertions(+), 51 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
index 458f2ec..ff3ff3f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
+++ b/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)
--
Gitblit v1.9.3