From 2461281f7bdf6a4e7a016b528280ed5ec7b9f2a2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 07 Oct 2021 14:28:15 +0800
Subject: [PATCH] 1.山洪
---
src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 103 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml b/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
index d60c83a..0bc7cad 100644
--- a/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
+++ b/src/main/java/org/springblade/modules/rsvr/mapper/RsvrRMapper.xml
@@ -27,6 +27,30 @@
GROUP BY a.BGMD, EDMD
</select>
+ <!-- <select id="selectyjck" resultType="java.util.HashMap">-->
+ <!-- SELECT rs.STCD,-->
+ <!-- rs.TM,-->
+ <!-- isnull(rs.RZ, 0) as RZ,-->
+ <!-- rsv.FSLTDZ,-->
+ <!-- st.STNM,-->
+ <!-- st.LGTD,-->
+ <!-- rs.INQ,-->
+ <!-- rs.W,-->
+ <!-- rs.OTQ,-->
+ <!-- st.LTTD,-->
+ <!-- st.ADDVNM-->
+ <!-- FROM dbo.ST_RSVR_R rs-->
+ <!-- LEFT JOIN (SELECT FSLTDZ, STCD-->
+ <!-- FROM dbo.ST_RSVRFSR_B-->
+ <!-- WHERE BGMD = #{egmd}-->
+ <!-- AND EDMD = #{edmd}-->
+ <!-- and FSLTDZ is not null) rsv ON rsv.STCD = rs.STCD-->
+ <!-- INNER JOIN sys_rsvr st ON st.STCD = rs.STCD-->
+ <!-- INNER JOIN dbo.ST_RSVRFCCH_B rst ON rst.STCD = rs.STCD-->
+ <!-- WHERE rs.TM >#{beginTime}-->
+ <!-- AND rs.TM <= #{endTime}-->
+ <!-- ORDER BY rs.TM DESC-->
+ <!-- </select>-->
<select id="selectyjck" resultType="java.util.HashMap">
SELECT rs.STCD,
rs.TM,
@@ -47,17 +71,61 @@
and FSLTDZ is not null) rsv ON rsv.STCD = rs.STCD
INNER JOIN sys_rsvr st ON st.STCD = rs.STCD
INNER JOIN dbo.ST_RSVRFCCH_B rst ON rst.STCD = rs.STCD
- WHERE rs.TM > #{beginTime}
+ WHERE rs.TM >= #{beginTime}
AND rs.TM <= #{endTime}
ORDER BY rs.TM DESC
</select>
<!--水库最新信息-->
+ <!-- <select id="selectyjcks" resultType="java.util.HashMap">-->
+ <!-- SELECT cs.STCD,-->
+ <!-- cs.TM,-->
+ <!-- isnull(cs1.RZ, 0) as RZ,-->
+ <!-- isnull(rsvr.RZS, 0) as RZS,-->
+ <!-- cs2.STNM,-->
+ <!-- cs3.INQ,-->
+ <!-- cs1.W,-->
+ <!-- cs3.OTQ,-->
+ <!-- cs2.LGTD,-->
+ <!-- cs2.LTTD,-->
+ <!-- cs2.ADDVNM,-->
+ <!-- rsv.FSLTDZ-->
+ <!-- FROM (-->
+ <!-- SELECT A.STCD,-->
+ <!-- MAX(A.TM) TM-->
+ <!-- FROM (SELECT STCD, TM, RZ, INQ, W, OTQ FROM dbo.ST_RSVR_R where TM >#{dateEnd} AND TM <=#{time}) AS A-->
+ <!-- INNER JOIN (SELECT STCD, STNM, ADDVNM, LTTD, LGTD FROM sys_rsvr) s ON A.STCD = s.STCD-->
+ <!-- GROUP BY A.STCD-->
+ <!-- ) cs-->
+ <!-- INNER JOIN (SELECT STCD, TM, RZ, INQ, W, OTQ FROM dbo.ST_RSVR_R where TM >#{dateEnd} AND TM <=#{time}) cs1-->
+ <!-- ON cs.STCD = cs1.STCD AND cs.TM = cs1.TM-->
+ <!-- INNER JOIN (SELECT STCD, STNM, ADDVNM, LTTD, LGTD FROM sys_rsvr) cs2 ON cs.STCD = cs2.STCD-->
+ <!-- LEFT JOIN (SELECT FSLTDZ, STCD-->
+ <!-- FROM dbo.ST_RSVRFSR_B-->
+ <!-- WHERE BGMD = #{egmd}-->
+ <!-- AND EDMD = #{edmd}-->
+ <!-- AND FSLTDZ IS NOT NULL) rsv ON rsv.STCD = cs.STCD-->
+ <!-- INNER JOIN (SELECT isnull(RZ, 0) AS RZS, STCD FROM ST_RSVR_R WHERE TM = #{tm}) rsvr-->
+ <!-- ON rsvr.STCD = cs.STCD-->
+ <!-- INNER JOIN (SELECT STCD, INQ, OTQ FROM dbo.ST_RSVR_R WHERE TM = #{timez}) cs3 ON cs.STCD = cs3.STCD-->
+ <!-- GROUP BY cs.STCD,-->
+ <!-- cs.TM,-->
+ <!-- cs1.RZ,-->
+ <!-- rsvr.RZS,-->
+ <!-- cs3.INQ,-->
+ <!-- cs1.W,-->
+ <!-- cs3.OTQ,-->
+ <!-- cs2.STNM,-->
+ <!-- cs2.ADDVNM,-->
+ <!-- cs2.LGTD,-->
+ <!-- cs2.LTTD,-->
+ <!-- rsv.FSLTDZ-->
+ <!-- </select> -->
<select id="selectyjcks" resultType="java.util.HashMap">
SELECT cs.STCD,
cs.TM,
- isnull(cs1.RZ, 0) as RZ,
- isnull(rsvr.RZS, 0) as RZS,
+ isnull(cs1.RZ, 0) AS RZ,
+ isnull(rsvr.RZS, 0) AS RZS,
cs2.STNM,
cs3.INQ,
cs1.W,
@@ -71,10 +139,20 @@
MAX(A.TM) TM
FROM (SELECT STCD, TM, RZ, INQ, W, OTQ FROM dbo.ST_RSVR_R) AS A
INNER JOIN (SELECT STCD, STNM, ADDVNM, LTTD, LGTD FROM sys_rsvr) s ON A.STCD = s.STCD
+ LEFT JOIN (SELECT FSLTDZ, STCD
+ FROM dbo.ST_RSVRFSR_B
+ WHERE BGMD = #{egmd}
+ AND EDMD = #{edmd}
+ AND FSLTDZ IS NOT NULL) d ON d.STCD = A.STCD
+ LEFT JOIN (SELECT isnull(RZ, 0) AS RZS, STCD FROM ST_RSVR_R WHERE TM = #{tm}) z
+ ON z.STCD = A.STCD
+ LEFT JOIN (SELECT STCD, INQ, OTQ FROM dbo.ST_RSVR_R WHERE TM = #{timez}) zz
+ ON A.STCD = zz.STCD
GROUP BY A.STCD
) cs
INNER JOIN (SELECT STCD, TM, RZ, INQ, W, OTQ FROM dbo.ST_RSVR_R) cs1
- ON cs.STCD = cs1.STCD AND cs.TM = cs1.TM
+ ON cs.STCD = cs1.STCD
+ AND cs.TM = cs1.TM
INNER JOIN (SELECT STCD, STNM, ADDVNM, LTTD, LGTD FROM sys_rsvr) cs2 ON cs.STCD = cs2.STCD
LEFT JOIN (SELECT FSLTDZ, STCD
FROM dbo.ST_RSVRFSR_B
@@ -107,9 +185,9 @@
<!--水库涨幅,跌幅信息-->
<select id="selectsk" resultType="java.util.HashMap">
SELECT DISTINCT s.STCD,
- isnull(s.maxZ, 0) as maxZ,
+ isnull(s.maxZ, 0) as maxZ,
MAX(CASE s.maxAgeNum WHEN 1 THEN s.TM ELSE '' END) OVER ( partition BY s.STCD ) maxTM,
- isnull(s.minZ, 0) as minZ,
+ isnull(s.minZ, 0) as minZ,
MAX(CASE s.minAgeNum WHEN 1 THEN s.TM ELSE '' END) OVER ( partition BY s.STCD ) minTM,
st.STNM,
ad.ADDVNM
@@ -118,8 +196,8 @@
TM,
MAX(RZ) OVER ( partition BY STCD ) maxZ,
MIN(RZ) OVER ( partition BY STCD ) minZ,
- RANK() OVER ( partition BY STCD ORDER BY RZ DESC ) maxAgeNum,
- RANK() OVER ( partition BY STCD ORDER BY RZ ) minAgeNum
+ RANK() OVER ( partition BY STCD ORDER BY RZ DESC ) maxAgeNum,
+ RANK() OVER ( partition BY STCD ORDER BY RZ ) minAgeNum
FROM dbo.ST_RSVR_R
WHERE TM > #{beginTime}
AND TM <= #{endTime}
@@ -132,9 +210,9 @@
<select id="selectInfo" resultType="java.util.HashMap">
SELECT top 1 r.*,
- rs.*,
- st.*,
- rsv.FSLTDZ
+ rs.*,
+ st.*,
+ rsv.FSLTDZ
FROM ST_RSVR_R r
LEFT JOIN ST_RSVRFCCH_B rs ON r.STCD = rs.STCD
LEFT JOIN sys_rsvr st ON st.STCD = r.STCD
@@ -203,19 +281,28 @@
<select id="selectCode" resultType="java.lang.String">
- SELECT stuff((SELECT ',' + CONVERT(VARCHAR(25), rs.STCD)
+ SELECT stuff((SELECT ',' + CONVERT(VARCHAR (25), rs.STCD)
FROM ST_RSVR_R r
INNER JOIN sys_rsvr rs ON
rs.STCD = r.STCD
WHERE r.TM >= #{beginTime}
AND r.TM <= #{endTime}
GROUP BY rs.STCD
- FOR XML PATH ( '' )),
+ FOR XML PATH ('')),
1,
1,
''
) AS stcd
</select>
+ <!-- <select id="selectCode" resultType="java.lang.String">-->
+ <!-- SELECT stuff((SELECT ',' + CONVERT(VARCHAR(25), rs.STCD)-->
+ <!-- FROM sys_rsvr rs-->
+ <!-- FOR XML PATH ( '' )),-->
+ <!-- 1,-->
+ <!-- 1,-->
+ <!-- ''-->
+ <!-- ) AS stcd-->
+ <!-- </select>-->
<select id="sel" resultType="java.util.HashMap">
SELECT cs.STCD,
cs.TM,
@@ -242,7 +329,9 @@
ON cs.STCD = cs2.STCD
LEFT JOIN (SELECT FSLTDZ, STCD
FROM dbo.ST_RSVRFSR_B
- WHERE BGMD = #{egmd} AND EDMD = #{edmd} AND FSLTDZ IS NOT NULL) rsv ON rsv.STCD = cs.STCD
+ WHERE BGMD = #{egmd}
+ AND EDMD = #{edmd}
+ AND FSLTDZ IS NOT NULL) rsv ON rsv.STCD = cs.STCD
GROUP BY cs.STCD,
cs.TM,
cs1.RZ,
--
Gitblit v1.9.3