From 39caebba35fc84824f5cd51d189fe322d5145803 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Nov 2021 16:15:14 +0800
Subject: [PATCH] 1.山洪

---
 src/main/java/org/springblade/modules/mountainrain/controller/ss.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 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 7987e04..483f070 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/ss.java
@@ -16,14 +16,16 @@
 @Component
 public class ss {
 	@Autowired
-	private  IRegionWeightService regionWeightService;
+	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++) {
@@ -45,7 +47,7 @@
 			for (int j = 0; j < passDaysList.size() - 2; j++) {
 				List<Map<String, Object>> map = mountainrainService.selectMtwo(passDaysList.get(j).toString(), passDaysList.get(j + 1).toString(), code);
 				if (map.size() == 0 || i > map.size() - 1) {
-					stcd=split[i];
+					//stcd=split[i];
 					break;
 				}
 				BigDecimal w = (BigDecimal) map.get(i).get("drp");
@@ -65,14 +67,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("成功");
 	}
 

--
Gitblit v1.9.3