From 139987154fa26282b30cf237c13d999f5f5547a2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 13 Sep 2021 08:40:26 +0800
Subject: [PATCH] 1.山洪
---
src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java b/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
index bb86591..b7ae504 100644
--- a/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
+++ b/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
@@ -220,7 +220,7 @@
texta += "库水位暂无数据、";
} else {
DecimalFormat df = new DecimalFormat("#0.00");
- texta += "库水位" + df.format(RZ) + "(米)、";
+ texta += "库水位" + df.format(RZ) + "米、";
}
if (map.get(i).get("INQ") == null) {
texta += "入库流量暂无数据、";
@@ -228,14 +228,14 @@
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texta += "入库流量" + INQ + "(立方米每秒)、";
+ texta += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texta += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texta += "蓄水量" + W + "(百万立方米)、";
+ texta += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texta += "出库流量暂无数据;";
@@ -243,7 +243,7 @@
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texta += "出库流量" + OTQ + "(立方米每秒);";
+ texta += "出库流量" + OTQ + "立方米每秒;";
}
}
if (stnm.equals("廖坊")) {
@@ -252,7 +252,7 @@
texth += "库水位暂无数据、";
} else {
DecimalFormat df = new DecimalFormat("#0.00");
- texth += "库水位" + df.format(RZ) + "(米)、";
+ texth += "库水位" + df.format(RZ) + "米、";
}
if (map.get(i).get("INQ") == null) {
texth += "入库流量暂无数据、";
@@ -260,14 +260,14 @@
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texth += "入库流量" + INQ + "(立方米每秒)、";
+ texth += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texth += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texth += "蓄水量" + W + "(百万立方米)、";
+ texth += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texth += "出库流量暂无数据。";
@@ -275,7 +275,7 @@
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texth += "出库流量" + OTQ + "(立方米每秒)。";
+ texth += "出库流量" + OTQ + "立方米每秒。";
}
}
alist.add(map.get(i));
@@ -288,21 +288,21 @@
//站点名称
String stnm = map.get(i).get("STNM").toString();
if (stnm.equals("洪门")) {
- texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:" + "库水位" + RZ + "(米)、";
+ texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:" + "库水位" + RZ + "米、";
if (map.get(i).get("INQ") == null) {
texta += "入库流量暂无数据、";
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texta += "入库流量" + INQ + "(立方米每秒)、";
+ texta += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texta += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texta += "蓄水量" + W + "(百万立方米)、";
+ texta += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texta += "出库流量暂无数据;";
@@ -310,25 +310,25 @@
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texta += "出库流量" + OTQ + "(立方米每秒);";
+ texta += "出库流量" + OTQ + "立方米每秒;";
}
}
if (stnm.equals("廖坊")) {
- texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:" + "库水位" + RZ + "m、";
+ texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:" + "库水位" + RZ + "米、";
if (map.get(i).get("INQ") == null) {
texth += "入库流量暂无数据、";
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texth += "入库流量" + INQ + "(立方米每秒)、";
+ texth += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texth += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texth += "蓄水量" + W + "(百万立方米)、";
+ texth += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texth += "出库流量暂无数据。";
@@ -336,7 +336,7 @@
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texth += "出库流量" + OTQ + "(立方米每秒)。";
+ texth += "出库流量" + OTQ + "立方米每秒。";
}
}
alist.add(map.get(i));
@@ -355,21 +355,21 @@
//站点名称
String stnm = map.get(i).get("STNM").toString();
if (stnm.equals("洪门")) {
- texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "(米)、" + "库水位" + RZ + "(米)、";
+ texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "米、" + "库水位" + RZ + "米、";
if (map.get(i).get("INQ") == null) {
texta += "入库流量暂无数据、";
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texta += "入库流量" + INQ + "(立方米每秒)、";
+ texta += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texta += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texta += "蓄水量" + W + "(百万立方米)、";
+ texta += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texta += "出库流量暂无数据;";
@@ -377,25 +377,25 @@
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texta += "出库流量" + OTQ + "(立方米每秒);";
+ texta += "出库流量" + OTQ + "立方米每秒;";
}
}
if (stnm.equals("廖坊")) {
- texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "(米)、" + "库水位" + RZ + "(米)、";
+ texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "米、" + "库水位" + RZ + "米、";
if (map.get(i).get("INQ") == null) {
texth += "入库流量暂无数据、";
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0.000");
- texth += "入库流量" + INQ + "(立方米每秒)、";
+ texth += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texth += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texth += "蓄水量" + W + "(百万立方米)、";
+ texth += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texth += "出库流量暂无数据。";
@@ -403,7 +403,7 @@
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
//DecimalFormat df = new DecimalFormat("#0");
- texth += "出库流量" + OTQ + "(立方米每秒)。";
+ texth += "出库流量" + OTQ + "立方米每秒。";
}
}
}
@@ -592,7 +592,7 @@
if (RZ == 0) {
texta += "库水位暂无数据、";
} else {
- texta += "库水位" + RZ + "(米)、";
+ texta += "库水位" + RZ + "米、";
}
if (v < 0) {
texta += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -604,21 +604,21 @@
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
- texta += "入库流量" + INQ + "(立方米每秒)、";
+ texta += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texta += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texta += "蓄水量" + W + "(百万立方米)、";
+ texta += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texta += "出库流量暂无数据、";
} else {
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
- texta += "出库流量" + OTQ + "(立方米每秒);";
+ texta += "出库流量" + OTQ + "立方米每秒;";
}
// texta += "汛限水位暂无数据;";
} else if (stnm.equals("廖坊")) {
@@ -626,7 +626,7 @@
if (RZ == 0) {
texth += "库水位暂无数据、";
} else {
- texth += "库水位" + RZ + "(米)、";
+ texth += "库水位" + RZ + "米、";
}
if (v < 0) {
texth += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -638,21 +638,21 @@
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
- texth += "入库流量" + INQ + "(立方米每秒)、";
+ texth += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texth += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texth += "蓄水量" + W + "(百万立方米)、";
+ texth += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texth += "出库流量暂无数据、";
} else {
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
- texth += "出库流量" + OTQ + "(立方米每秒)。";
+ texth += "出库流量" + OTQ + "立方米每秒。";
}
}
blist.add(map.get(i));
@@ -671,7 +671,7 @@
if (RZ == 0) {
texta += "库水位暂无数据、";
} else {
- texta += "库水位" + RZ + "(米)、";
+ texta += "库水位" + RZ + "米、";
}
if (v < 0) {
texta += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -683,21 +683,21 @@
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
- texta += "入库流量" + INQ + "(立方米每秒)、";
+ texta += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texta += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texta += "蓄水量" + W + "(百万立方米)、";
+ texta += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texta += "出库流量暂无数据;";
} else {
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
- texta += "出库流量" + OTQ + "(立方米每秒);";
+ texta += "出库流量" + OTQ + "立方米每秒;";
}
// texta += "汛限水位暂无数据;";
} else if (stnm.equals("廖坊")) {
@@ -705,7 +705,7 @@
if (RZ == 0) {
texth += "库水位暂无数据、";
} else {
- texth += "库水位" + RZ + "(米)、";
+ texth += "库水位" + RZ + "米、";
}
if (v < 0) {
texth += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -717,21 +717,21 @@
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
- texth += "入库流量" + INQ + "(立方米每秒)、";
+ texth += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texth += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texth += "蓄水量" + W + "(百万立方米)、";
+ texth += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texth += "出库流量暂无数据。";
} else {
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
- texth += "出库流量" + OTQ + "(立方米每秒)。";
+ texth += "出库流量" + OTQ + "立方米每秒。";
}
}
blist.add(map.get(i));
@@ -755,7 +755,7 @@
if (RZ == 0) {
texta += "库水位暂无数据、";
} else {
- texta += "库水位" + RZ + "(米)、";
+ texta += "库水位" + RZ + "米、";
}
if (v < 0) {
texta += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -767,21 +767,21 @@
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
- texta += "入库流量" + INQ + "(立方米每秒)、";
+ texta += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texta += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texta += "蓄水量" + W + "(百万立方米)、";
+ texta += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texta += "出库流量暂无数据;";
} else {
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
- texta += "出库流量" + OTQ + "(立方米每秒);";
+ texta += "出库流量" + OTQ + "立方米每秒;";
}
// texta += "汛限水位暂无数据;";
} else if (stnm.equals("廖坊")) {
@@ -789,7 +789,7 @@
if (RZ == 0) {
texth += "库水位暂无数据、";
} else {
- texth += "库水位" + RZ + "(米)、";
+ texth += "库水位" + RZ + "米、";
}
if (v < 0) {
texth += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -801,21 +801,21 @@
} else {
BigDecimal inq = (BigDecimal) map.get(i).get("INQ");
double INQ = inq.doubleValue();
- texth += "入库流量" + INQ + "(立方米每秒)、";
+ texth += "入库流量" + INQ + "立方米每秒、";
}
if (map.get(i).get("W") == null) {
texth += "蓄水量暂无数据、";
} else {
BigDecimal w = (BigDecimal) map.get(i).get("W");
double W = w.doubleValue();
- texth += "蓄水量" + W + "(百万立方米)、";
+ texth += "蓄水量" + W + "百万立方米、";
}
if (map.get(i).get("OTQ") == null) {
texth += "出库流量暂无数据。";
} else {
BigDecimal otq = (BigDecimal) map.get(i).get("OTQ");
double OTQ = otq.doubleValue();
- texth += "出库流量" + OTQ + "(立方米每秒)。";
+ texth += "出库流量" + OTQ + "立方米每秒。";
}
}
}
--
Gitblit v1.9.3