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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 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 ec51071..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
@@ -7,17 +7,19 @@
import cn.gistack.sm.intelligentCall.service.CallService;
import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
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;
import cn.gistack.sm.sjztmd.word.util.WordUtil;
-import cn.gistack.sm.sjztmd.word.vo.DzkInfo;
-import cn.gistack.sm.sjztmd.word.vo.OverDetail;
-import cn.gistack.sm.sjztmd.word.vo.SzInfo;
-import cn.gistack.sm.sjztmd.word.vo.TotalInfo;
+import cn.gistack.sm.sjztmd.word.vo.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.AllArgsConstructor;
+import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tenant.annotation.NonDS;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.MediaType;
@@ -30,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;
@@ -51,6 +54,25 @@
private final ISmsRecordClient smsRecordClient;
private final CallService callService;
+
+ private final ITbProjectService tbProjectService;
+
+ private final IYwFloodReportInfoService ywFloodReportInfoService;
+
+ @Override
+ public String saveYesterdayFloodReportContent(String isShow) throws Exception {
+ //获取总览、大中库、明细数据
+ List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
+ OverWord overWord = WordUtil.GetOverInfo(totalList);
+// bladeRedis.set("yesterDayFloodReport-totalinfo",overWord.getTotalInfo());
+// bladeRedis.set("yesterDayFloodReport-oversmallinfo",overWord.getOverSmallInfo());
+ YwFloodReportInfo info = new YwFloodReportInfo();
+ info.setCreateTime(new Date());
+ info.setTotalInfo(overWord.getTotalInfo());
+ info.setOversmallInfo(overWord.getOverSmallInfo());
+ ywFloodReportInfoService.save(info);
+ return "保存昨日报汛内容";
+ }
@Override
@GetMapping(GENERATE_DAY_REPORT_FLOOD)
@@ -79,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<>();
@@ -98,9 +121,14 @@
List<TotalInfo> totalOverList = sjztmdService.getTotalOverInfo(isShow, normalParams);
List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow, over10Params);
+
+
+ //昨日报汛内容
+ YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(oneDayBefore.format(formatter2));
+
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()) {
- data = WordUtil.GetOverInfo(totalList, dzkList, overDetailList, szInfoList, dxyjList, whtjList);
+ data = WordUtil.GetOverInfo(totalList, dzkList, overDetailList, szInfoList, dxyjList, whtjList, ywFloodReportInfo);
} else {
data = WordUtil.GetNotInSeasonOverInfo(totalList, dzkList, overDetailList, szInfoList, totalOverList, totalOver10List);
@@ -114,6 +142,18 @@
return path;
}
+ @Override
+ @GetMapping(ISjztMdClient.GET_RESERVOIR_RAINFALL_FORECAST)
+ public void getReservoirRainfallForecast(List<String> dayIndexList) {
+ 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