From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 0029c33..3d42942 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
@@ -11,6 +11,7 @@
import cn.gistack.sm.sjztmd.feign.IAttResBaseClient;
import cn.gistack.sm.sjztmd.feign.ISjztMdClient;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
+import cn.gistack.sm.sjztmd.service.ITbProjectService;
import cn.gistack.sm.sjztmd.service.IYwFloodReportInfoService;
import cn.gistack.sm.sjztmd.util.MyDateUtils;
import cn.gistack.sm.sjztmd.word.service.ISjztmdService;
@@ -31,6 +32,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URLEncoder;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -52,6 +54,8 @@
private final ISmsRecordClient smsRecordClient;
private final CallService callService;
+
+ private final ITbProjectService tbProjectService;
private final IYwFloodReportInfoService ywFloodReportInfoService;
@@ -97,9 +101,10 @@
List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);
//外呼统计
+ DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
CallTaskResultVO callTaskResult = new CallTaskResultVO();
- callTaskResult.setStartTime(oneDayBefore.format(formatter));
- callTaskResult.setEndTime(now.format(formatter));
+ callTaskResult.setStartTime(oneDayBefore.format(formatter2));
+ callTaskResult.setEndTime(now.format(formatter2));
List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult);
HashMap<String, String> over10Params = new HashMap<>();
@@ -119,8 +124,7 @@
//昨日报汛内容
- QueryWrapper queryWrapper = new QueryWrapper();
- YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper);
+ YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2));
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()) {
@@ -144,6 +148,12 @@
sjztmdService.getReservoirRainfallForecast(dayIndexList);
}
+ @Override
+ @GetMapping(ISjztMdClient.GET_PROJECT_CHECK_STATUS)
+ public void setGetProjectCheckStatus() throws Exception {
+ tbProjectService.updateallcheck();
+ }
+
private void createFile(String filePath, byte[] bytes) {
// 将byte[]写入文件
try (FileOutputStream fos = new FileOutputStream(filePath)) {
--
Gitblit v1.9.3