From a98b1db4392c357304036e8b3cdd01646920300d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 21 Jul 2022 15:41:23 +0800
Subject: [PATCH] 1.山洪
---
src/main/java/org/springblade/modules/mountainrain/controller/ss.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/mountainrain/controller/ss.java b/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
index 1d350f4..e805e52 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
@@ -10,24 +10,31 @@
import org.springframework.web.bind.annotation.GetMapping;
import java.math.BigDecimal;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@Component
public class ss {
@Autowired
+ private IRegionWeightService regionWeightService;
+
+ @Autowired
private IMountainrainService mountainrainService;
@Scheduled(cron = "0 0 8 * * ?")
public R soleval() {
- mountainrainService.soildel();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String dateNow = sdf.format(new Date());
+ //mountainrainService.soildel();
int intervals = 31;
ArrayList passDaysList = new ArrayList<>();
for (int i = 0; i < intervals; i++) {
passDaysList.add(getDays(i, false));
}
Collections.sort(passDaysList);
- String s = mountainrainService.selectCode();
+ //String s = mountainrainService.selectCode();
+ String s = regionWeightService.selectCode();
String[] split = s.split(",");
String strArrays = "";
for (int i = 0; i < split.length; i++) {
@@ -61,14 +68,16 @@
}
}
}
- if (v1 > 60) {
- mountainrainService.soleInster(stcd, "60");
- } else {
- String a = String.valueOf(v1);
- mountainrainService.soleInster(stcd, a);
+ if (stcd!=null) {
+ if (v1 > 60) {
+ mountainrainService.soleInster(stcd, "60", dateNow);
+ } else {
+ String a = String.valueOf(v1);
+ mountainrainService.soleInster(stcd, a, dateNow);
+ }
}
- }
+ }
return R.success("成功");
}
@@ -89,4 +98,18 @@
return result;
}
+ private static String ss(int i,int j, boolean b) {
+ Calendar calendar = Calendar.getInstance();
+ if (b) {
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + i);
+ } else {
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - i);
+ }
+ calendar.add(Calendar.DATE, -j);
+ Date today = calendar.getTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd 08:00:00");
+ String result = format.format(today);
+ return result;
+ }
+
}
--
Gitblit v1.9.3