From 1c5e273bbd5751664dd9b65149c4b2dd3ede94ec Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 08 Sep 2021 11:30:37 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml | 29 +++++++++++---
src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java | 3 -
src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java | 32 ++++++++--------
3 files changed, 39 insertions(+), 25 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 dc7d8c6..f479446 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
@@ -474,7 +474,6 @@
String dateEnd24 =dateEnds24;
//对应雨量站
- long startTime=System.currentTimeMillis();
String s = mountainrainService.selectCode();
String[] split = s.split(",");
String strArrays = "";
@@ -483,7 +482,6 @@
}
String code = strArrays.substring(0, strArrays.length() - 1);
List<MountainrainsCVO> mountainrainsCVOS = mountainrainService.Mountains(times, dateEnd24, dateEnd1, dateEnd3, dateEnd6,timess,code);
- long endTime=System.currentTimeMillis(); //获取结束时间
List<Map<String, Object>> lists = new ArrayList<>();
for (int i = 0; i < mountainrainsCVOS.size(); i++) {
if (mountainrainsCVOS.get(i).getCenconding()==null){
@@ -496,7 +494,6 @@
map.put("Max", Max);
lists.add(map);
}
- System.out.println("程序运行时间： "+(endTime-startTime)+"ms");
return R.data(lists);
}
diff --git a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
index 654b401..80e88f8 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
@@ -265,13 +265,30 @@
) AS siteids
</select>
- <select id="Mountains">
+ <select id="Mountains" resultMap="mountainrainResultMapcInfo">
SELECT
- a.drp1,
- b.drp3,
- c.drp6,
- d.dyp,
- cs.*
+ cs.id,
+ cs.cenconding,
+ cs.crainfall,
+ isnull(cs.gohour, 0) gohour,
+ isnull(cs.gthour, 0) gthour,
+ isnull(cs.gshour, 0) gshour,
+ isnull(cs.imohour, 0) imohour,
+ isnull(cs.imthour, 0) imthour,
+ isnull(cs.imshour, 0) imshour,
+ a.drp1,
+ b.drp3,
+ c.drp6,
+ isnull(d.dyp, 0) dyp,
+ cs.township,
+ cs.village,
+ cs.village_group,
+ cs.dj,
+ cs.bw,
+ cs.county,
+ isnull(cs.fyear, 0) as fyear,
+ isnull(cs.tyear, 0) as tyear,
+ isnull(cs.oyear, 0) as oyear
FROM
(
SELECT
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 3a26f88..f1f76b1 100644
--- a/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
+++ b/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
@@ -427,7 +427,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);
@@ -514,13 +514,13 @@
List<Map<String, Object>> list2 = regionWeightService.selectLALL();
List<Map<String, Object>> list3 = regionWeightService.selectLNam();
Map mc = new HashMap();
- for (int a=0;a<list2.size();a++){
- for (int b=0;b<list3.size();b++){
+ for (int a = 0; a < list2.size(); a++) {
+ for (int b = 0; b < list3.size(); b++) {
String code = list2.get(a).get("code").toString();
String num = list2.get(a).get("num").toString();
String code1 = list3.get(b).get("code").toString();
- if (code.equals(code1)){
- mc.put(list3.get(b).get("cname").toString(),num);
+ if (code.equals(code1)) {
+ mc.put(list3.get(b).get("cname").toString(), num);
}
}
}
@@ -625,24 +625,25 @@
}
}
- Collections.sort(listc, new Comparator<Map<String,Object>>(){
- public int compare(Map<String,Object> o1,Map<String,Object> o2){
- return (Double)o1.get("dyp")<(Double)o2.get("dyp")?1:( (Double)o1.get("dyp")==(Double)o2.get("dyp")?0:-1);
+ Collections.sort(listc, new Comparator<Map<String, Object>>() {
+ public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+ return (Double) o1.get("dyp") < (Double) o2.get("dyp") ? 1 : ((Double) o1.get("dyp") == (Double) o2.get("dyp") ? 0 : -1);
}
});
- for (int c=0;c<listc.size();c++){
- if (c<3){
- text+=listc.get(c).get("region").toString()+":"+listc.get(c).get("dyp")+"(mm),";
+ for (int c = 0; c < listc.size(); c++) {
+ if (c < 3) {
+ text += listc.get(c).get("region").toString() + ":" + listc.get(c).get("dyp") + "(mm),";
}
}
- String a="流域前三的为："+text.substring(0,text.length()-1)+"。";
+ String a = "流域前三的为：" + text.substring(0, text.length() - 1) + "。";
mapc.put("List", listc);
mapc.put("Num", mc);
- mapc.put("text", yday+a);
+ mapc.put("text", yday + a);
lists.add(mapc);
}
return R.data(lists);
}
+
/**
* @param type 类型 0：实时 1 历史
* @param timez 当前时间 yyyy-MM-dd HH:00:00
@@ -696,8 +697,7 @@
lists.add(map);
}
return R.data(lists);
- }
- else {
+ } else {
//当前时间
String time = timez;
@@ -840,7 +840,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);
--
Gitblit v1.9.3