From 87204491aac135822f96f3fff297ddca400ea8c9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 20 Oct 2021 15:09:32 +0800
Subject: [PATCH] 1.山洪
---
src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 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 fad624e..1695556 100644
--- a/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
+++ b/src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java
@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.*;
+import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Map.Entry;
@@ -753,7 +754,14 @@
@GetMapping("/selectReDc")
public R selectReDc(String beginTime, String endTime) {
String substring = beginTime.substring(0, 10);
- String r = beginTime.substring(11, 13);
+ String t = beginTime.substring(11, 13);
+ String r;
+ if(t.substring(0,1).equals("0")){
+ r=beginTime.substring(12,13);
+ }
+ else {
+ r=beginTime.substring(11,13);
+ }
//截取月日
String[] strs = substring.split("-");
//月
@@ -761,7 +769,14 @@
//日
String day = strs[2].toString();
String substrings = endTime.substring(0, 10);
- String rs = endTime.substring(11, 13);
+ String ts = endTime.substring(11, 13);
+ String rs;
+ if(ts.substring(0,1).equals("0")){
+ rs=beginTime.substring(12,13);
+ }
+ else {
+ rs=beginTime.substring(11,13);
+ }
//截取月日
String[] strss = substrings.split("-");
//月
@@ -772,7 +787,6 @@
String s = regionWeightService.selectCode();
String[] split = s.split(",");
String strArrays = "";
- System.out.println("数量："+split.length);
for (int i = 0; i < split.length; i++) {
strArrays += "'" + split[i] + "',";
}
@@ -799,7 +813,8 @@
String addvnm = maps.get(i).get("ADDVNM").toString();
String stnm = maps.get(i).get("STNM").toString();
BigDecimal bigDecimaldyp = (BigDecimal) maps.get(i).get("dyp");//日雨量
- double dyp = bigDecimaldyp.doubleValue();
+ double dyps = bigDecimaldyp.doubleValue();
+ double dyp = (double) Math.round(dyps * 10) / 10;
if (dyp > 0 && dyp <= 10) {
lista.add(maps.get(i));
} else if (dyp > 10 && dyp <= 25) {
@@ -824,7 +839,8 @@
}
} else {
BigDecimal bigDecimaldyp = (BigDecimal) maps.get(i).get("dyp");//日雨量
- double dyp = bigDecimaldyp.doubleValue();
+ double dyps = bigDecimaldyp.doubleValue();
+ double dyp = (double) Math.round(dyps * 10) / 10;
if (dyp > 0 && dyp <= 10) {
lista.add(maps.get(i));
} else if (dyp > 10 && dyp <= 25) {
@@ -941,8 +957,13 @@
e.printStackTrace();
}
Process proc;
+ Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+ long url=timestamp.getTime();
+ Map m= new HashMap();
+ m.put("url",url+".png");
+ String[] args1=new String[]{"python","D:\\fz\\fz.py", String.valueOf(url)};
try {
- proc = Runtime.getRuntime().exec("python D:\\fz\\fz.py");
+ proc = Runtime.getRuntime().exec(args1);
BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
String line = null;
while ((line = in.readLine()) != null) {
@@ -955,6 +976,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
+ lists.add(m);
return R.data(lists);
}
@@ -964,7 +986,14 @@
@GetMapping("/selectReMs")
public R selectReMs(String beginTime, String endTime) {
String substring = beginTime.substring(0, 10);
- String r = beginTime.substring(11, 13);
+ String t = beginTime.substring(11, 13);
+ String r;
+ if(t.substring(0,1).equals("0")){
+ r=beginTime.substring(12,13);
+ }
+ else {
+ r=beginTime.substring(11,13);
+ }
//截取月日
String[] strs = substring.split("-");
//月
@@ -972,7 +1001,14 @@
//日
String day = strs[2].toString();
String substrings = endTime.substring(0, 10);
- String rs = endTime.substring(11, 13);
+ String ts = endTime.substring(11, 13);
+ String rs;
+ if(ts.substring(0,1).equals("0")){
+ rs=beginTime.substring(12,13);
+ }
+ else {
+ rs=beginTime.substring(11,13);
+ }
//截取月日
String[] strss = substrings.split("-");
//月
@@ -1132,7 +1168,14 @@
@GetMapping("/selectReL")
public R selectReL(String beginTime, String endTime) {
String substring = beginTime.substring(0, 10);
- String r = beginTime.substring(11, 13);
+ String t = beginTime.substring(11, 13);
+ String r;
+ if(t.substring(0,1).equals("0")){
+ r=beginTime.substring(12,13);
+ }
+ else {
+ r=beginTime.substring(11,13);
+ }
//截取月日
String[] strs = substring.split("-");
//月
@@ -1140,7 +1183,14 @@
//日
String day = strs[2].toString();
String substrings = endTime.substring(0, 10);
- String rs = endTime.substring(11, 13);
+ String ts = endTime.substring(11, 13);
+ String rs;
+ if(t.substring(0,1).equals("0")){
+ rs=beginTime.substring(12,13);
+ }
+ else {
+ rs=beginTime.substring(11,13);
+ }
//截取月日
String[] strss = substrings.split("-");
//月
--
Gitblit v1.9.3