From ec5c0176b5ecc52a051867b412e541c56b70320b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 08 Sep 2021 08:29:57 +0800
Subject: [PATCH] 1.单位

---
 src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml          |   23 ++++-------------------
 src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java |    9 ++++++---
 src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml          |    4 ++--
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java b/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
index 7316ef9..d3e3bb2 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
@@ -393,19 +393,22 @@
 			String dateEnd24 =dateEnds24;
 
 			//对应雨量站
+			long startTime=System.currentTimeMillis();
 			List<MountainrainsCVO> mountainrainsCVOS = mountainrainService.selectcInfos(times, dateEnd24, dateEnd1, dateEnd3, dateEnd6,timess);
+			long endTime=System.currentTimeMillis(); //获取结束时间
 			List<Map<String, Object>> lists = new ArrayList<>();
 			for (int i = 0; i < mountainrainsCVOS.size(); i++) {
+				if (mountainrainsCVOS.get(i).getCenconding()==null){
+					continue;
+				}
 				Map<String, Object> map = new HashMap<String, Object>();
 					int Max =mountainrainService .Max(mountainrainsCVOS.get(i).getDrp1(), mountainrainsCVOS.get(i).getDrp3(),
 						mountainrainsCVOS.get(i).getGohour(), mountainrainsCVOS.get(i).getGthour());
-				/*if(Max==0){
-					continue;
-				}*/
 					map.put("List", mountainrainsCVOS.get(i));
 					map.put("Max", Max);
 					lists.add(map);
 			}
+			System.out.println("程序运行时间： "+(endTime-startTime)+"ms");
 			return R.data(lists);
 
 		}
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 fd9bfd4..cf67c04 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
@@ -182,7 +182,6 @@
     <select id="selectcInfos" resultMap="mountainrainResultMapcInfo">
         SELECT
             cs.id,
-            cs1.c,
             cs.cenconding,
             cs.crainfall,
             isnull(cs.gohour,0) gohour,
@@ -208,24 +207,12 @@
             ( SELECT id,cenconding,crainfall,township, village, village_group, dj, bw,county,fyear,tyear,oyear,gohour,gthour,gshour,imohour,imthour,imshour FROM blade_mountain ) cs
                 INNER JOIN (
                 SELECT
-                    ISNULL( COUNT ( * ), 0 ) AS c,
-                    STCD
-                FROM
-                    dbo.ST_PPTN_R
-                WHERE
-                    TM &gt;=#{dateEnd24}
-                  AND TM &lt;=#{times}
-                GROUP BY
-                    STCD
-            ) cs1 ON cs.cenconding = cs1.STCD
-                INNER JOIN (
-                SELECT
                     ISNULL( SUM ( str.DRP ), 0 ) AS drp1,
                     STCD
                 FROM
                     dbo.ST_PPTN_R str
                 WHERE
-                    str.TM &gt;=#{dateEnd1}
+                    str.TM &gt;#{dateEnd1}
                   AND str.TM &lt;=#{times}
                 GROUP BY
                     STCD
@@ -237,7 +224,7 @@
                 FROM
                     dbo.ST_PPTN_R s
                 WHERE
-                    s.TM &gt;=#{dateEnd3}
+                    s.TM &gt;#{dateEnd3}
                   AND s.TM &lt;=#{times}
                 GROUP BY
                     STCD
@@ -249,7 +236,7 @@
                 FROM
                     dbo.ST_PPTN_R strs
                 WHERE
-                    strs.TM &gt;=#{dateEnd6}
+                    strs.TM &gt;#{dateEnd6}
                   AND strs.TM &lt;=#{times}
                 GROUP BY
                     STCD
@@ -260,11 +247,9 @@
                 FROM
                     dbo.ST_PPTN_R strd
                 WHERE
-                    strd.TM &gt;=#{timess}
+                    strd.TM &gt;#{timess}
                   AND strd.TM &lt;=#{times}
                 GROUP BY STCD
             ) csd on csd.STCD=cs.cenconding
-        WHERE
-            cs.cenconding IS NOT NULL order by id
     </select>
 </mapper>
diff --git a/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml b/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
index a6d4666..9bef9c1 100644
--- a/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
+++ b/src/main/java/org/springblade/modules/regionWeight/mapper/RegionWeightMapper.xml
@@ -162,14 +162,14 @@
                  FROM dbo.ST_STBPRP_B st
                           INNER JOIN dbo.ST_ADDVCD_D ad on ad.ADDVCD = st.ADDVCD
                  WHERE st.STTP = 'PP'
-                    OR st.STTP = 'ZQ'
+                    OR st.STTP = 'ZQ' OR st.STTP='ZZ'
              ) c
                  INNER JOIN (
             SELECT SUM
                        (strd.DRP) AS dyp,
                    STCD
             FROM dbo.ST_PPTN_R strd
-            WHERE strd.TM &gt;= #{beginTime}
+            WHERE strd.TM &gt; #{beginTime}
               AND strd.TM &lt;= #{endTime}
             GROUP BY STCD
         ) csd ON csd.STCD = c.STCD

--
Gitblit v1.9.3