From 0cfec24a4eb3807acc3014b92b7e2ebc7b804f1c Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 25 Sep 2021 10:09:41 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml |   56 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
index 12ec528..35f2187 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
@@ -257,8 +257,10 @@
 
     <select id="selectCode" resultType="java.lang.String">
         SELECT stuff((
-            SELECT ',' + CONVERT(VARCHAR (25), cenconding)
-            FROM dbo.blade_mountain FOR XML PATH ('')),
+            SELECT ',' + CONVERT(VARCHAR (25), m.cenconding)
+            FROM dbo.blade_mountain m
+                     INNER JOIN ST_STBPRP_B s ON s.STCD = m.cenconding
+            GROUP BY m.cenconding FOR XML PATH ('')),
 		1,
 		1,
 	''
@@ -303,7 +305,7 @@
             SELECT ISNULL(SUM(s.DRP), 0) AS drp2,
                    STCD
             FROM dbo.ST_PPTN_R s
-            WHERE s.TM &gt; #{dateEnd3}
+            WHERE s.TM &gt; #{dateEnd2}
               AND s.TM &lt;= #{times}
               AND s.STCD IN (${code})
             GROUP BY s.STCD
@@ -312,7 +314,7 @@
             SELECT ISNULL(SUM(strs.DRP), 0) AS drp3,
                    STCD
             FROM dbo.ST_PPTN_R strs
-            WHERE strs.TM &gt; #{dateEnd6}
+            WHERE strs.TM &gt; #{dateEnd3}
               AND strs.TM &lt;= #{times}
               AND strs.STCD IN (${code})
             GROUP BY STCD
@@ -340,6 +342,10 @@
                    gthours
             FROM blade_mountain
         ) cs ON cs.cenconding = a.STCD
+                 LEFT JOIN (
+            SELECT stcd, soilval
+            FROM sys_soleval
+        ) so ON so.stcd = a.STCD
     </select>
 
     <!--第一种预警-->
@@ -352,11 +358,11 @@
                cs.HNNM,
                cs.LTTD,
                cs.LGTD,
-               isnull(a.drp1, 0) as drp1
-            isnull(b.drp2,0) as drp2
-            isnull(c.drp3,0) as drp3
+               isnull(a.drp1, 0) as drp1,
+               isnull(b.drp2, 0) as drp2,
+               isnull(c.drp3, 0) as drp3
         FROM (
-                 SELECT ISNULL(SUM(str.DRP), 0) AS drp1,
+                 SELECT SUM(str.DRP) AS drp1,
                         STCD
                  FROM dbo.ST_PPTN_R str
                  WHERE str.TM &gt; #{dateEnd1}
@@ -365,7 +371,7 @@
                  GROUP BY str.STCD
              ) a
                  FULL JOIN (
-            SELECT ISNULL(SUM(s.DRP), 0) AS drp2,
+            SELECT SUM(s.DRP) AS drp2,
                    STCD
             FROM dbo.ST_PPTN_R s
             WHERE s.TM &gt; #{dateEnd2}
@@ -374,7 +380,7 @@
             GROUP BY s.STCD
         ) b ON a.STCD = b.STCD
                  FULL JOIN (
-            SELECT ISNULL(SUM(strs.DRP), 0) AS drp3,
+            SELECT SUM(strs.DRP) AS drp3,
                    STCD
             FROM dbo.ST_PPTN_R strs
             WHERE strs.TM &gt; #{dateEnd3}
@@ -395,22 +401,16 @@
             FROM dbo.ST_STBPRP_B st
                      INNER JOIN dbo.ST_ADDVCD_D ad ON ad.ADDVCD = st.ADDVCD
         ) cs ON cs.STCD = a.STCD
-                 LEFT JOIN (
-            SELECT stcd, soilval
-            FROM sys_soleval
-        ) so ON so.stcd = a.STCD
     </select>
 
     <!--土壤湿度计算-->
     <select id="selectMtwo" resultType="java.util.Map">
-        SELECT SUM
-                   (DRP) AS drp,
+        SELECT ISNULL(SUM(DRP), 0) AS drp,
                STCD
         FROM dbo.ST_PPTN_R
         WHERE TM &gt; #{time3}
           AND TM &lt;= #{time}
           AND STCD IN (${code})
-          AND datename(HOUR,TM) = 8
         GROUP BY STCD
     </select>
 
@@ -426,4 +426,26 @@
         DELETE
         FROM sys_soleval
     </delete>
+
+
+    <!--通过行政区编码查询站点-->
+    <select id="selectAddvcd" resultType="java.util.Map" >
+        SELECT STCD
+        FROM dbo.ST_STBPRP_B
+        WHERE STTP='RR' AND ADDVCD=#{addvcd}
+    </select>
+
+    <!-- 批量插入预报信息-->
+    <insert id ="insertYuc" parameterType="java.util.List" >
+        insert into sys_yucpptn
+        (STCD, TM, DRP, INTV)
+        values
+        <foreach collection ="list" item="reddemCode" index= "index" separator =",">
+            (
+            #{reddemCode.STCD}, #{reddemCode.TM},
+            #{reddemCode.DRP},
+            #{reddemCode.INTV}
+            )
+        </foreach >
+    </insert >
 </mapper>

--
Gitblit v1.9.3