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/mountainrain/mapper/MountainrainMapper.xml | 86 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 34 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 a6976b9..d9c40c1 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
@@ -255,27 +255,27 @@
</select>
- <select id="selectCode" resultType="java.lang.String">
- SELECT stuff((
- 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 ('')),
+ <select id="selectCode" resultType="java.lang.String">
+ SELECT stuff((
+ 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,
''
) AS siteids
- </select>
+ </select>
-<!-- <select id="selectCode" resultType="java.lang.String">-->
-<!-- SELECT stuff((-->
-<!-- SELECT ',' + CONVERT(VARCHAR (25), cenconding)-->
-<!-- FROM dbo.blade_mountain FOR XML PATH ('')),-->
-<!-- 1,-->
-<!-- 1,-->
-<!-- ''-->
-<!-- ) AS siteids-->
-<!-- </select>-->
+ <!-- <select id="selectCode" resultType="java.lang.String">-->
+ <!-- SELECT stuff((-->
+ <!-- SELECT ',' + CONVERT(VARCHAR (25), cenconding)-->
+ <!-- FROM dbo.blade_mountain FOR XML PATH ('')),-->
+ <!-- 1,-->
+ <!-- 1,-->
+ <!-- ''-->
+ <!-- ) AS siteids-->
+ <!-- </select>-->
<select id="Mountains" resultMap="mountainrainResultMapcInfo">
SELECT cs.id,
@@ -426,9 +426,10 @@
<insert id="soleInster">
insert
- sys_soleval(stcd,soilval) value (
+ sys_soleval(stcd,soilval,stime) value (
#{stcd},
- #{soilval}
+ #{soilval},
+ #{stime}
)
</insert>
@@ -561,7 +562,9 @@
sm.river,
sm.addvnm,
st.LGTD,
- st.LTTD
+ st.LTTD,
+ st.HNNM,
+ cs2.minz
FROM (
SELECT A.STCD,
MAX(A.TM) TM
@@ -574,7 +577,11 @@
INNER JOIN (SELECT stcd, yjsw, stname, river, addvnm
FROM sys_smallriver
GROUP BY stcd, yjsw, stname, river, addvnm) sm ON sm.stcd = cs1.STCD
- INNER JOIN (SELECT LGTD, LTTD, STCD FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+ INNER JOIN (SELECT LGTD, LTTD, STCD,HNNM FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+ INNER JOIN (SELECT MIN(Z) AS minz, STCD
+ FROM dbo.ST_RIVER_R
+ where TM > #{begintime24} AND TM <= #{time}
+ GROUP BY STCD) cs2 ON cs.STCD = cs2.STCD
</select>
<!--大江大河-->
<select id="selctbgriver" resultType="java.util.Map">
@@ -586,7 +593,9 @@
sm.river,
sm.addvnm,
st.LGTD,
- st.LTTD
+ st.LTTD,
+ st.HNNM,
+ cs2.minz
FROM (
SELECT A.STCD,
MAX(A.TM) TM
@@ -599,13 +608,17 @@
INNER JOIN (SELECT stcd, yjsw, stname, river, addvnm
FROM sys_bigriver
GROUP BY stcd, yjsw, stname, river, addvnm) sm ON sm.stcd = cs1.STCD
- INNER JOIN (SELECT LGTD, LTTD, STCD FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+ INNER JOIN (SELECT LGTD, LTTD, STCD, HNNM FROM ST_STBPRP_B) st ON st.STCD = cs1.STCD
+ INNER JOIN (SELECT MIN(Z) AS minz, STCD
+ FROM dbo.ST_RIVER_R
+ where TM > #{begintime24} AND TM <= #{time}
+ GROUP BY STCD) cs2 ON cs.STCD = cs2.STCD
</select>
<select id="selectTu" resultType="java.util.Map">
SELECT m.cenconding,
- m.village_group as village,
+ m.village_group as village,
m.county,
isnull(s.soilval, 0) AS soilval
FROM blade_mountain m
@@ -675,7 +688,7 @@
) cs ON cs.cenconding = a.STCD
LEFT JOIN (
SELECT stcd, soilval
- FROM sys_soleval
+ FROM sys_soleval where datediff(day,stime, #{stime}) = 0
) so ON so.stcd = a.STCD
</select>
<!--山洪2小时预警-->
@@ -736,7 +749,7 @@
) cs ON cs.cenconding = a.STCD
LEFT JOIN (
SELECT stcd, soilval
- FROM sys_soleval
+ FROM sys_soleval where datediff(day,stime, #{stime}) = 0
) so ON so.stcd = a.STCD
</select>
<select id="MountainTr" resultMap="mountainrainResultMapcInfo">
@@ -796,7 +809,7 @@
) cs ON cs.cenconding = a.STCD
LEFT JOIN (
SELECT stcd, soilval
- FROM sys_soleval
+ FROM sys_soleval where datediff(day,stime, #{stime}) = 0
) so ON so.stcd = a.STCD
</select>
@@ -905,13 +918,18 @@
<!--土壤色斑图-->
<select id="selectS" resultType="java.util.Map">
- SELECT
- so.stcd,
- so.soilval,
- st.LGTD,
- st.LTTD
- FROM
- sys_soleval so
- INNER JOIN dbo.ST_STBPRP_B st ON so.stcd= st.STCD
+ SELECT so.stcd,
+ so.soilval,
+ st.LGTD,
+ st.LTTD
+ FROM sys_soleval so
+ INNER JOIN dbo.ST_STBPRP_B st ON so.stcd = st.STCD
+ where datediff(day,stime, #{stime}) = 0
</select>
+
+
+<!-- <!–土壤湿度优化–>-->
+<!-- <select id="ss" resultType="java.util.Map">-->
+<!-- SELECT * FROM ST_PPTN_R WHERE DATEDIFF(dd, TM , '2021-06-29 08:00:00') <= 30 AND RIGHT(CONVERT(varchar(19),TM,120),5)='00:00'-->
+<!-- </select>-->
</mapper>
--
Gitblit v1.9.3