From 2461281f7bdf6a4e7a016b528280ed5ec7b9f2a2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 07 Oct 2021 14:28:15 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java |  222 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 106 insertions(+), 116 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 f82e3dd..931b57c 100644
--- a/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
+++ b/src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java
@@ -172,17 +172,17 @@
 				edmd = e2;
 			}
 		}
+//		String s = rsvrRService.selectCode(beginTime, endTime);
+//		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<Map<String, Object>> map = rsvrRService.selectyjck(egmd, edmd, beginTime, endTime);
-		String s = rsvrRService.selectCode(beginTime, endTime);
-		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<Map<String, Object>> sel = rsvrRService.sel(egmd, edmd, code);
-		map.addAll(sel);
+//		List<Map<String, Object>> sel = rsvrRService.sel(egmd, edmd, code);
+//		map.addAll(sel);
 		//用来判断是否重复统计超警信息
 		Map mnum = new HashMap();
 		Map mnums = new HashMap();
@@ -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 + "(米)、";
+							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 + "立方米每秒。";
 								}
 							}
 						}
@@ -416,66 +416,46 @@
 			} else {
 				text += "有" + number + "个水库站预警;" + texta + texth;
 			}
-			//水库涨幅,跌幅信息
-			List<Map<String, Object>> selecthds = rsvrRService.selectsk(beginTime, endTime);
+//			//水库涨幅,跌幅信息
+			//List<Map<String, Object>> selecthds = rsvrRService.selectsk(beginTime, endTime);
 			Map m1 = new HashMap();
 			Map m2 = new HashMap();
 			Map m = new HashMap();
-			for (int j = 0; j < selecthds.size(); j++) {
-				String stcd = selecthds.get(j).get("STCD").toString();
-				//站点名称
-				String stnm = selecthds.get(j).get("STNM").toString();
-				if (selecthds.get(j).get("ADDVNM") == null) {
-					continue;
-				}
-				//省,市
-				String addvcd5 = selecthds.get(j).get("ADDVNM").toString();
-				//最大值
-				BigDecimal maxZ = (BigDecimal) selecthds.get(j).get("maxZ");
-				//最大值出现时间
-				String maxTM = selecthds.get(j).get("maxTM").toString();
-				//最小值
-				BigDecimal minZ = (BigDecimal) selecthds.get(j).get("minZ");
-				//最小值出现时间
-				String minTM = selecthds.get(j).get("minTM").toString();
-				SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-				Date sd1 = df.parse(maxTM);
-				Date sd2 = df.parse(minTM);
-				//如果最大时间大于最小时间就是涨幅
-				if (sd1.after(sd2)) {
-					//创建一个map集合保存涨幅数据
-					double v = maxZ.doubleValue();
-					double v1 = minZ.doubleValue();
-					//涨幅值
-					double v2 = v - v1;
-					double v3 = (double) Math.round(v2 * 100) / 100;
-					m1.put(v3, stnm.replaceAll(" ", "") + "站");
-					c.put(stcd, v3);
-				}
-				//跌幅
-				else {
-					//创建一个map集合保存跌幅数据
-					double v = maxZ.doubleValue();
-					double v1 = minZ.doubleValue();
-					//涨幅值
-					double v2 = v1 - v;
-					double v3 = (double) Math.round(v2 * 100) / 100;
-					m2.put(Math.abs(v3), stnm.replaceAll(" ", "") + "站");
-					c.put(stcd, v3);
-				}
-			}
-			if (m1.size()!=0) {
-				//获取涨幅最大的信息
-				Object maxKey = getMaxKey(m1);
-				String s1 = m1.get(maxKey).toString();
-				text += " 涨幅最大的是:" + s1 + "(涨" + maxKey + "米)。";
-			}
-			if (m2.size()!=0) {
-				//获取跌幅最大的信息
-				Object maxKey2 = getMaxKey(m2);
-				String s2 = m2.get(maxKey2).toString();
-				text += " 跌幅最大的是:" + s2 + "(跌" + maxKey2 + "米)。";
-			}
+//			for (int j = 0; j < selecthds.size(); j++) {
+//				String stcd = selecthds.get(j).get("STCD").toString();
+//				//站点名称
+//				String stnm = selecthds.get(j).get("STNM").toString();
+//				if (selecthds.get(j).get("ADDVNM") == null) {
+//					continue;
+//				}
+//				//省,市
+//				String addvcd5 = selecthds.get(j).get("ADDVNM").toString();
+//				//最大值
+//				BigDecimal maxZ = (BigDecimal) selecthds.get(j).get("maxZ");
+//				//最大值出现时间
+//				String maxTM = selecthds.get(j).get("maxTM").toString();
+//				//最小值
+//				BigDecimal minZ = (BigDecimal) selecthds.get(j).get("minZ");
+//				//最小值出现时间
+//				String minTM = selecthds.get(j).get("minTM").toString();
+//				SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//				Date sd1 = df.parse(maxTM);
+//				Date sd2 = df.parse(minTM);
+//				double v = maxZ.doubleValue();
+//				double v1 = minZ.doubleValue();
+//				//涨幅值
+//				double v2 = v - v1;
+//				double v3 = (double) Math.round(v2 * 100) / 100;
+//				m1.put(v3, stnm.replaceAll(" ", "") + "站");
+//				c.put(stcd, v3);
+//				//获取涨幅最大的信息
+//			}
+//			if (m1.size() != 0) {
+//				Object maxKey = getMaxKey(m1);
+//				String s1 = m1.get(maxKey).toString();
+//				text += " 涨幅最大的是:" + s1 + "(涨" + maxKey + "米)。";
+//			}
+
 			m.put("text", text);
 			m.put("number", number);
 			m.put("Yjlist", ylist);
@@ -494,6 +474,15 @@
 		int ws = 1;
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String time = df.format(new Date());
+		Date date = null;
+		// 把Date按照格式转换成字符串
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		try {
+			date = sdf.parse(time);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		String dateEnd = sdf.format(date);
 		SimpleDateFormat dfz = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
 		String timez = dfz.format(new Date());
 		String yearc = time.substring(0, 4);
@@ -556,7 +545,7 @@
 			}
 		}
 		//水库水情预警信息
-		List<Map<String, Object>> map = rsvrRService.selectyjcks(egmd, edmd, timec, timez);
+		List<Map<String, Object>> map = rsvrRService.selectyjcks(egmd, edmd, timec, timez,time,dateEnd);
 		//用来判断是否重复统计超警信息
 		Map mnum = new HashMap();
 		//定义list保存预警信息
@@ -574,7 +563,7 @@
 				RZ = rz.doubleValue();
 				String stcd = map.get(i).get("STCD").toString();
 				String ti = map.get(i).get("TM").toString();
-				Map<String, Object> stringObjectMap = rsvrRService.selectRZ(stcd, timec);
+				//Map<String, Object> stringObjectMap = rsvrRService.selectRZ(stcd, timec);
 				//BigDecimal zc = (BigDecimal) stringObjectMap.get("RZ");
 				BigDecimal zc = (BigDecimal) map.get(i).get("RZS");
 				double ZC = zc.doubleValue();
@@ -592,7 +581,7 @@
 						if (RZ == 0) {
 							texta += "库水位暂无数据、";
 						} else {
-							texta += "库水位" + RZ + "(米)、";
+							texta += "库水位" + RZ + "米、";
 						}
 						if (v < 0) {
 							texta += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -604,21 +593,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 +615,7 @@
 						if (RZ == 0) {
 							texth += "库水位暂无数据、";
 						} else {
-							texth += "库水位" + RZ + "(米)、";
+							texth += "库水位" + RZ + "米、";
 						}
 						if (v < 0) {
 							texth += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -638,21 +627,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 +660,7 @@
 						if (RZ == 0) {
 							texta += "库水位暂无数据、";
 						} else {
-							texta += "库水位" + RZ + "(米)、";
+							texta += "库水位" + RZ + "米、";
 						}
 						if (v < 0) {
 							texta += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -683,21 +672,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 +694,7 @@
 						if (RZ == 0) {
 							texth += "库水位暂无数据、";
 						} else {
-							texth += "库水位" + RZ + "(米)、";
+							texth += "库水位" + RZ + "米、";
 						}
 						if (v < 0) {
 							texth += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -717,21 +706,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 +744,7 @@
 							if (RZ == 0) {
 								texta += "库水位暂无数据、";
 							} else {
-								texta += "库水位" + RZ + "(米)、";
+								texta += "库水位" + RZ + "米、";
 							}
 							if (v < 0) {
 								texta += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -767,21 +756,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 +778,7 @@
 							if (RZ == 0) {
 								texth += "库水位暂无数据、";
 							} else {
-								texth += "库水位" + RZ + "(米)、";
+								texth += "库水位" + RZ + "米、";
 							}
 							if (v < 0) {
 								texth += "比昨日8时下降" + Math.abs(v) + "米、";
@@ -801,21 +790,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 + "立方米每秒。";
 							}
 						}
 					}
@@ -1032,3 +1021,4 @@
 	}
 
 }
+

--
Gitblit v1.9.3