From 26aea0b140a7b35bc530abba35c7f308916f2b2c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 19 Jun 2024 16:27:26 +0800
Subject: [PATCH] 每日报汛增加短信预警
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
index 2753007..6c55c92 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -2,6 +2,8 @@
+import cn.gistack.alerts.sms.feign.ISmsRecordClient;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
import cn.gistack.sm.sjztmd.util.MyDateUtils;
import cn.gistack.sm.sjztmd.word.service.ISjztmdService;
import cn.gistack.sm.sjztmd.word.util.BriefReportUtil;
@@ -13,6 +15,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@@ -25,6 +28,8 @@
import java.io.*;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -45,6 +50,7 @@
private final ISjztmdService sjztmdService;
+ private final ISmsRecordClient smsRecordClient;
@GetMapping(value = "/getBriefReport")
public R getBriefReport() {
//获取总览、大中库、明细数据
@@ -83,6 +89,21 @@
List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
List<SzInfo> szInfoList = sjztmdService.getSzInfo(isShow);
+ //短信预警数量
+ SmsResultVO vo = new SmsResultVO();
+ // 获取当前日期
+ LocalDate today = LocalDate.now();
+ // 获取前一天日期
+ LocalDate yesterday = today.minusDays(1);
+ // 格式化日期并打印
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ vo.setStartTime(yesterday.format(formatter));
+ vo.setEndTime(yesterday.format(formatter));
+ vo.setSmsType("2");
+ vo.setResCode("0");
+ vo.setIsExport(1);
+ List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);
+
HashMap<String,String> over10Params = new HashMap<>();
//small_start_stag=0&small_end_stag=2&mid_start_stag=0&mid_end_stag=2&big_start_stag=0&big_end_stag=2
over10Params.put("small_start_stag", "0.1");
@@ -100,7 +121,7 @@
List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow,over10Params);
byte[] data = null;
if (MyDateUtils.isTodayInFloodSeason()){
- data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);
+ data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList,dxyjList);
}else {
data= WordUtil.GetNotInSeasonOverInfo(totalList,dzkList,overDetailList,szInfoList,totalOverList,totalOver10List);
--
Gitblit v1.9.3