From 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
index 7d08d98..7e72b88 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
@@ -32,6 +32,7 @@
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
@@ -65,21 +66,22 @@
//短信预警数量
SmsResultVO vo = new SmsResultVO();
// 获取当前日期
- LocalDate today = LocalDate.now();
+ LocalDateTime now = LocalDateTime.now();
// 获取前一天日期
- LocalDate yesterday = today.minusDays(1);
+ LocalDateTime oneDayBefore = now.minusDays(1);
// 格式化日期并打印
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- vo.setStartTime(yesterday.format(formatter));
- vo.setEndTime(yesterday.format(formatter));
+ // 定义日期时间格式，包含年-月-日 时:分:秒
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ vo.setStartTime(oneDayBefore.format(formatter));
+ vo.setEndTime(now.format(formatter));
vo.setSmsType("2");
vo.setResCode("0");
List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);
//外呼统计
CallTaskResultVO callTaskResult = new CallTaskResultVO();
- callTaskResult.setStartTime(yesterday.format(formatter));
- callTaskResult.setEndTime(yesterday.format(formatter));
+ callTaskResult.setStartTime(oneDayBefore.format(formatter));
+ callTaskResult.setEndTime(now.format(formatter));
List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult);
HashMap<String, String> over10Params = new HashMap<>();
@@ -112,6 +114,12 @@
return path;
}
+ @Override
+ @GetMapping(ISjztMdClient.GET_RESERVOIR_RAINFALL_FORECAST)
+ public void getReservoirRainfallForecast(List<String> dayIndexList) {
+ sjztmdService.getReservoirRainfallForecast(dayIndexList);
+ }
+
private void createFile(String filePath, byte[] bytes) {
// 将byte[]写入文件
try (FileOutputStream fos = new FileOutputStream(filePath)) {
--
Gitblit v1.9.3