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/feign/SjztMdClientImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 b11bd6c..a868584 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
@@ -1,5 +1,7 @@
package cn.gistack.sm.sjztmd.feign;
+import cn.gistack.alerts.sms.feign.ISmsRecordClient;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
import cn.gistack.resource.feign.IOssClient;
import cn.gistack.resource.vo.MyMultipartFile;
import cn.gistack.sm.sjztmd.entity.AttResBase;
@@ -27,6 +29,8 @@
import java.io.IOException;
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;
@@ -41,6 +45,8 @@
private final ISjztmdService sjztmdService;
private final IOssClient ossClient;
+ private final ISmsRecordClient smsRecordClient;
+
@Override
@GetMapping(GENERATE_DAY_REPORT_FLOOD)
public String generateDayReportFlood(String isShow) throws Exception{
@@ -52,6 +58,20 @@
List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
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");
+ 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
@@ -69,7 +89,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