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

---
 src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java |   98 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 95 insertions(+), 3 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..dc7d8c6 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);
 
 		}
@@ -446,5 +449,94 @@
 
 	}
 
+
+	/**
+	 * 查询洪水预警
+	 */
+	@ApiLog("查询洪水预警")
+	@GetMapping("/sss")
+	public R selectcInfoss(int type,String time,String dateEnds1,String dateEnds3,String dateEnds6,String dateEnds24,int k,String timei) {
+		if (type == 0 && k==13) {
+			//当前时间
+			String times = time;
+
+			String dateEnd1 = dateEnds1;
+
+			String timess=timei;
+
+			//三个小时前的时间
+			String dateEnd3 =dateEnds3;
+
+			//六个小时前的时间
+			String dateEnd6 =dateEnds6;
+
+			//二十四个小时前的时间
+			String dateEnd24 =dateEnds24;
+
+			//对应雨量站
+			long startTime=System.currentTimeMillis();
+			String s = mountainrainService.selectCode();
+			String[] split = s.split(",");
+			String strArrays = "";
+			for (int i = 0; i < split.length; i++) {
+				strArrays += "'" + split[i] + "',";
+			}
+			String code = strArrays.substring(0, strArrays.length() - 1);
+			List<MountainrainsCVO> mountainrainsCVOS = mountainrainService.Mountains(times, dateEnd24, dateEnd1, dateEnd3, dateEnd6,timess,code);
+			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());
+				map.put("List", mountainrainsCVOS.get(i));
+				map.put("Max", Max);
+				lists.add(map);
+			}
+			System.out.println("程序运行时间: "+(endTime-startTime)+"ms");
+			return R.data(lists);
+
+		}
+		else {
+			//当前时间
+			String times = time;
+
+			String dateEnd1 = dateEnds1;
+
+			String timess=timei;
+
+			//三个小时前的时间
+			String dateEnd3 =dateEnds3;
+
+			//六个小时前的时间
+			String dateEnd6 =dateEnds6;
+
+			//二十四个小时前的时间
+			String dateEnd24 =dateEnds24;
+
+			//对应雨量站
+			List<MountainrainsCVO> mountainrainsCVOS = mountainrainService.selectcInfo(times, dateEnd24, dateEnd1, dateEnd3, dateEnd6,timess);
+			List<Map<String, Object>> lists = new ArrayList<>();
+			for (int i = 0; i < mountainrainsCVOS.size(); i++) {
+				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);
+
+			}
+			return R.data(lists);
+		}
+
+	}
+
+
 }
 

--
Gitblit v1.9.3