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/controller/MountainrainController.java | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 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 c870d42..cb963c6 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
@@ -32,6 +32,7 @@
import org.springblade.modules.mountain.service.IMountainService;
import org.springblade.modules.mountain.vo.MountainVO;
import org.springblade.modules.mountainrain.entity.Mountainrain;
+import org.springblade.modules.mountainrain.entity.Yucpptn;
import org.springblade.modules.mountainrain.service.IMountainrainService;
import org.springblade.modules.mountainrain.vo.*;
import org.springblade.modules.mountainrain.wrapper.MountainrainWrapper;
@@ -44,6 +45,8 @@
import javax.validation.Valid;
import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
@@ -572,6 +575,7 @@
List<Map<String, Object>> list = mountainrainService.selecMone(times, dateEnd1, dateEnd2, dateEnd3, code);
List<Map<String, Object>> lists = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> map = new HashMap<String, Object>();
BigDecimal w1 = (BigDecimal) list.get(i).get("drp1");
double drp1 = w1.doubleValue();
BigDecimal w2 = (BigDecimal) list.get(i).get("drp2");
@@ -579,37 +583,23 @@
BigDecimal w3 = (BigDecimal) list.get(i).get("drp3");
double drp3 = w3.doubleValue();
if (drp1 > 30) {
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("List", list.get(i));
map.put("flage1", "true");
- map.put("flage2", "false");
- map.put("flage3", "false");
- lists.add(map);
}
if (drp2 > 50) {
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("List", list.get(i));
- map.put("flage1", "false");
map.put("flage2", "true");
- map.put("flage3", "false");
lists.add(map);
}
if (drp3 > 80) {
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("List", list.get(i));
- map.put("flage1", "false");
- map.put("flage2", "false");
map.put("flage3", "true");
lists.add(map);
} else {
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("List", list.get(i));
map.put("flage1", "false");
map.put("flage2", "false");
map.put("flage3", "false");
lists.add(map);
}
-
+ map.put("List", list.get(i));
+ lists.add(map);
}
return R.data(lists);
}
@@ -621,7 +611,6 @@
*
* @return
*/
- @Scheduled(cron = "0 0 8 * * ?")
@GetMapping("/soleval")
public R soleval() {
mountainrainService.soildel();
@@ -692,4 +681,34 @@
return result;
}
+
+ /**
+ * 山洪预报
+ *
+ * @param addvcd 行政区编码
+ * @param time 时间
+ * @param intv 降雨时段
+ * @return
+ */
+ @GetMapping("/yuc")
+ public R yuc(String addvcd, String time, String intv) throws ParseException {
+ List<Yucpptn> yucpptnList = new ArrayList<Yucpptn>();
+ //通过行政区查询站点编码
+ List<Map<String, Object>> list = mountainrainService.selectAddvcd(addvcd);
+ for (int i = 0; i < list.size(); i++) {
+ Yucpptn yucpptn = new Yucpptn();
+ //站点编码
+ String stcd = list.get(i).get("STCD").toString();
+ yucpptn.setSTCD(stcd);
+ DateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = sf.parse(time);
+ java.sql.Date sqlDate = new java.sql.Date(date.getTime());
+ yucpptn.setINTV(intv);
+ yucpptnList.add(yucpptn);
+ }
+ //预警信息添加
+ mountainrainService.insertYuc(yucpptnList);
+ return R.data("");
+ }
+
}
--
Gitblit v1.9.3