From 0fa45101a494897fe93b90d805b3ff0aedd36e17 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 15 Sep 2021 16:24:35 +0800
Subject: [PATCH] 1.山洪
---
src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java b/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
index b2cec61..0bc9c22 100644
--- a/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
+++ b/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
@@ -189,7 +189,7 @@
String years = strss[1].toString();
//日
String days = strss[2].toString();
- String yday = year + "月" + day + "日" + r + "时-" + years + "月" + days + "日" + rs + "时。";
+ String yday = year + "月" + day + "日" + r + "时-" + years + "月" + days + "日" + rs + "时";
//最新雨量值
List<Map<String, Object>> map = regionWeightService.selectReM(beginTime, endTime);
List<Map<String, Object>> mapAll = regionWeightService.selectAll();
@@ -300,7 +300,7 @@
});
//拼接前3位降雨最大的区域
double v3 = (double) Math.round(num * 10) / 10;
- String text = "全市日平均降雨量:" + v3 + "(毫米)。 ";
+ String text = "全市日平均降雨量:" + v3 + "毫米。 ";
String text1 = "县市区平均降雨量前3位为: ";
String tx = "";
for (int i = 0; i < entryList2.size(); i++) {
@@ -316,7 +316,7 @@
mapa.put("dyp", as);
listc.add(mapa);
if (i < 3) {
- tx += station_name + "降雨量为：" + as + "(毫米),";
+ tx += station_name + "降雨量为：" + as + "毫米,";
}
}
@@ -632,7 +632,7 @@
});
for (int c = 0; c < listc.size(); c++) {
if (c < 3) {
- text += listc.get(c).get("region").toString() + ":" + listc.get(c).get("dyp") + "(毫米),";
+ text += listc.get(c).get("region").toString() + ":" + listc.get(c).get("dyp") + "毫米,";
}
}
String a = "流域前三的为：" + text.substring(0, text.length() - 1) + "。";
@@ -773,7 +773,7 @@
List<Map<String, Object>> lists = new ArrayList<>();
Map<String, Object> map = new HashMap<String, Object>();
String text = "";
- String yday = year + "月" + day + "日" + r + "时-" + years + "月" + days + "日" + rs + "时。";
+ String yday = year + "月" + day + "日" + r + "时-" + years + "月" + days + "日" + rs + "时";
//0-10降雨量范围
List lista = new ArrayList<>();
//10-25降雨量范围
@@ -805,7 +805,15 @@
} else if (dyp > 250) {
listf.add(maps.get(i));
}
- text += stnm + "站" + dyp + "毫米,";
+ if (i==0){
+ text += addvnm+stnm + "站" + dyp + "毫米,";
+ }
+ if (i==1){
+ text += addvnm+stnm + "站" + dyp + "毫米次之,";
+ }
+ if (i==2){
+ text += addvnm+stnm + "站" + dyp + "毫米第三,";
+ }
} else {
BigDecimal bigDecimaldyp = (BigDecimal) maps.get(i).get("dyp");//日雨量
double dyp = bigDecimaldyp.doubleValue();
@@ -840,7 +848,7 @@
if (maps.size() == 0) {
a = yday + "暂无降雨信息。";
} else {
- a = yday + "点降雨量前三为:" + text.substring(0, text.length() - 1) + "。";
+ a = yday + "点最大降雨量为" + text.substring(0, text.length() - 1) + "。";
}
map.put("text", a);
lists.add(map);
@@ -917,7 +925,7 @@
String years = strss[1].toString();
//日
String days = strss[2].toString();
- String yday = year + "月" + day + "日" + r + "时-" + years + "月" + days + "日" + rs + "时。";
+ String yday = year + "月" + day + "日" + r + "时-" + years + "月" + days + "日" + rs + "时";
String ss = regionWeightService.selectCodeM();
String[] split = ss.split(",");
String strArrays = "";
@@ -1035,7 +1043,7 @@
});
//拼接前3位降雨最大的区域
double v3 = (double) Math.round(num * 10) / 10;
- String text = "全市日平均降雨量:" + v3 + "(毫米)。 ";
+ String text = "全市日平均降雨量:" + v3 + "毫米。 ";
String text1 = "县市区平均降雨量前3位为: ";
String tx = "";
for (int i = 0; i < entryList2.size(); i++) {
@@ -1051,7 +1059,7 @@
mapa.put("dyp", as);
listc.add(mapa);
if (i < 3) {
- tx += station_name + "降雨量为：" + as + "(毫米),";
+ tx += station_name + "降雨量为：" + as + "毫米,";
}
}
--
Gitblit v1.9.3