From a98b1db4392c357304036e8b3cdd01646920300d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 21 Jul 2022 15:41:23 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml b/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
index 2774ac8..992f204 100644
--- a/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
+++ b/src/main/java/org/springblade/modules/river/mapper/RiverRMapper.xml
@@ -91,7 +91,7 @@
     <!--河道自定义预警测试接口-->
     <select id="selecthdcs" resultType="java.util.HashMap">
         SELECT cs.STCD,
-               cs.TM,
+               cs1.TM,
                cs1.Z,
                cs1.Q,
                cs2.STNM,
@@ -103,7 +103,6 @@
                cs4.minZ
         FROM (
                  SELECT A.STCD,
-                        MAX(A.TM) TM,
                         s.ADDVCD
                  FROM (SELECT STCD, TM, Z, Q
                        FROM dbo.ST_RIVER_R
@@ -124,7 +123,6 @@
                             FROM dbo.ST_RIVER_R
                             WHERE TM &gt; #{beginTime}
                               AND TM &lt;= #{endTime}) cs1 ON cs.STCD = cs1.STCD
-            AND cs.TM = cs1.TM
                  INNER JOIN (SELECT STCD, STNM, LTTD, LGTD, ADDVCD, STTP
                              FROM dbo.ST_STBPRP_B
                              WHERE STTP = 'ZZ'
@@ -142,7 +140,7 @@
                                AND TM &lt;= #{endTime}
                              GROUP BY STCD) cs4 ON cs4.STCD = cs.STCD
         GROUP BY cs.STCD,
-                 cs.TM,
+                 cs1.TM,
                  cs1.Z,
                  cs2.STNM,
                  ad.ADDVNM,
@@ -152,6 +150,33 @@
                  rv.WRZ,
                  cs3.maxZ,
                  cs4.minZ
+        ORDER BY cs1.Z desc
+    </select>
+    <select id="selecthdcss" resultType="java.util.HashMap">
+        SELECT
+        A.STCD,
+        A.TM,
+        A.Z,
+        A.Q,
+        cs2.STNM,
+        cs2.LGTD,
+        cs2.LTTD,
+        ad.ADDVNM,
+        rv.WRZ,
+        cs3.maxZ,
+        cs4.minZ
+        FROM
+        dbo.ST_RIVER_R A
+        LEFT JOIN ( SELECT STCD, WRZ FROM dbo.ST_RVFCCH_B ) rv ON rv.STCD = A.STCD
+        LEFT JOIN ( SELECT STCD, STNM, LTTD, LGTD, ADDVCD, STTP FROM dbo.ST_STBPRP_B WHERE STTP = 'ZZ' OR STTP = 'ZQ')
+        cs2 ON cs2.STCD = A.STCD
+        LEFT JOIN ( SELECT ADDVCD, ADDVNM FROM dbo.ST_ADDVCD_D ) ad ON ad.ADDVCD = cs2.ADDVCD
+        LEFT JOIN ( SELECT STCD, MAX ( Z ) AS maxZ FROM dbo.ST_RIVER_R WHERE TM &gt;#{beginTime}
+        AND TM &lt;= #{endTime} GROUP BY STCD ) cs3 ON cs3.STCD = A.STCD
+        LEFT JOIN ( SELECT STCD, MIN ( Z ) AS minZ FROM dbo.ST_RIVER_R WHERE TM &gt;#{beginTime}
+        AND TM &lt;= #{endTime} GROUP BY STCD ) cs4 ON cs4.STCD = A.STCD
+        WHERE A.TM &gt; #{beginTime}
+          AND A.TM &lt;= #{endTime} AND A.STCD in(${code})
     </select>
 
     <!--河道最新超警信息-->
@@ -191,7 +216,7 @@
                                 or STTP = 'ZQ') cs2 ON cs.STCD = cs2.STCD
                  LEFT JOIN (SELECT STCD, WRZ FROM dbo.ST_RVFCCH_B) rv ON rv.STCD = cs.STCD
                  INNER JOIN (SELECT ADDVCD, ADDVNM FROM dbo.ST_ADDVCD_D) ad ON ad.ADDVCD = cs.ADDVCD
-                 INNER JOIN ( SELECT Z,STCD FROM ST_RIVER_R WHERE TM = '2021-09-11 08:00:00' ) z ON z.STCD= cs.STCD
+                 INNER JOIN (SELECT Z, STCD FROM ST_RIVER_R WHERE TM = #{timec}) z ON z.STCD = cs.STCD
         GROUP BY cs.STCD,
                  cs.TM,
                  cs1.Z,
@@ -343,4 +368,17 @@
                  INNER JOIN (SELECT ADDVCD, ADDVNM FROM dbo.ST_ADDVCD_D) ad ON ad.ADDVCD = cs.ADDVCD
                  LEFT JOIN (SELECT stcd, fy, oy, ty, toy FROM swz_chazhi WHERE ty IS NOT NULL) cs4 ON cs.STCD = cs4.stcd
     </select>
+
+
+    <select id="selectCode" resultType="java.lang.String">
+        SELECT stuff((
+            SELECT ',' + CONVERT(VARCHAR (25), STCD)
+            FROM dbo.ST_STBPRP_B st
+            WHERE st.STTP = 'ZQ'
+               OR st.STTP = 'ZZ' FOR XML PATH ('')),
+		1,
+		1,
+	''
+	) AS siteids
+    </select>
 </mapper>

--
Gitblit v1.9.3