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/mountainrain/controller/ss.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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..1996e3c 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
@@ -16,18 +16,24 @@
 @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++) {
@@ -62,10 +68,10 @@
 				}
 			}
 			if (v1 > 60) {
-				mountainrainService.soleInster(stcd, "60");
+				mountainrainService.soleInster(stcd, "60",dateNow);
 			} else {
 				String a = String.valueOf(v1);
-				mountainrainService.soleInster(stcd, a);
+				mountainrainService.soleInster(stcd, a,dateNow);
 			}
 		}
 

--
Gitblit v1.9.3