From 94ffd01bac711963ecc42e7cf8ab300045f16423 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Mon, 08 Jul 2024 13:43:05 +0800
Subject: [PATCH] 每日报汛调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 7e72b88..0029c33 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,18 @@
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.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;
@@ -51,6 +52,23 @@
private final ISmsRecordClient smsRecordClient;
private final CallService callService;
+
+ 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)
@@ -98,9 +116,15 @@
List<TotalInfo> totalOverList = sjztmdService.getTotalOverInfo(isShow, normalParams);
List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow, over10Params);
+
+
+ //昨日报汛内容
+ QueryWrapper queryWrapper = new QueryWrapper();
+ YwFloodReportInfo ywFloodReportInfo = ywFloodReportInfoService.getLatestReport(queryWrapper);
+
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);
--
Gitblit v1.9.3