From c244ddeecba1fc0685bf613004a783e0e0818993 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 07 Sep 2021 16:00:35 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/modules/river/controller/RiverRController.java | 9 ++++-----
src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/river/controller/RiverRController.java b/src/main/java/org/springblade/modules/river/controller/RiverRController.java
index 0244a49..6f8e360 100644
--- a/src/main/java/org/springblade/modules/river/controller/RiverRController.java
+++ b/src/main/java/org/springblade/modules/river/controller/RiverRController.java
@@ -198,9 +198,8 @@
texta += stnm.replaceAll(" ", "") + "水位" + df.format(Z) + "米,";
if (selecthd.get(i).get("Q") == null) {
texta += "流量暂无数据";
- } else {
- DecimalFormat dfs = new DecimalFormat("#0.000");
- texta += "流量" + dfs.format(Q) + "立方米每秒;";
+ } else {DecimalFormat dfs = new DecimalFormat("#0.000");
+ texta += "流量" + Q + "立方米每秒;";
}
}
}
@@ -225,8 +224,8 @@
if (selecthd.get(i).get("Q") == null) {
texta += "流量暂无数据;";
} else {
- DecimalFormat dfs = new DecimalFormat("#0.000");
- texta += "流量" + dfs.format(Q) + "立方米每秒;";
+ //DecimalFormat dfs = new DecimalFormat("#0.000");
+ texta += "流量" + Q + "立方米每秒;";
}
}
}
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 b867c60..45b462d 100644
--- a/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
+++ b/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
@@ -288,7 +288,7 @@
//站点名称
String stnm = map.get(i).get("STNM").toString();
if (stnm.equals("洪门")) {
- texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:" + "库水位" + RZ + "m、";
+ texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:" + "库水位" + RZ + "(米)、";
if (map.get(i).get("INQ") == null) {
texta += "入库流量暂无数据、";
} else {
@@ -355,7 +355,7 @@
//站点名称
String stnm = map.get(i).get("STNM").toString();
if (stnm.equals("洪门")) {
- texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "m、" + "库水位" + RZ + "m、";
+ texta += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "(米)、" + "库水位" + RZ + "(米)、";
if (map.get(i).get("INQ") == null) {
texta += "入库流量暂无数据、";
} else {
@@ -381,7 +381,7 @@
}
}
if (stnm.equals("廖坊")) {
- texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "m、" + "库水位" + RZ + "m、";
+ texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&:超出水位" + v3 + "(米)、" + "库水位" + RZ + "(米)、";
if (map.get(i).get("INQ") == null) {
texth += "入库流量暂无数据、";
} else {
--
Gitblit v1.9.3