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/util/WordUtil.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
index 04ab44a..2ff43b4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java
@@ -1,5 +1,6 @@
 package cn.gistack.sm.sjztmd.word.util;
 
+import cn.gistack.alerts.sms.vo.SmsResultVO;
 import cn.gistack.sm.sjztmd.util.MyDateUtils;
 import cn.gistack.sm.sjztmd.word.vo.*;
 import com.deepoove.poi.XWPFTemplate;
@@ -87,10 +88,10 @@
 	}
 
 
-	public static byte[] GetOverInfo(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList,List<SzInfo> szInfoList) throws Exception {
+	public static byte[] GetOverInfo(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList,List<SzInfo> szInfoList,List<SmsResultVO> dxyjList) throws Exception {
 		InputStream inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/doc/overFloodTemplate.docx");
 		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-		OverWord overWord = new OverWord(totalList, dzkList, overDetailList, szInfoList);
+		OverWord overWord = new OverWord(totalList, dzkList, overDetailList, szInfoList, dxyjList);
 		XWPFTemplate template = XWPFTemplate.compile(inputStream).render(createOverWordParam(overWord));
 		template.write(outputStream);
 		outputStream.flush();
@@ -128,8 +129,11 @@
 		String dxStr = StringUtil.isNotBlank(overWord.getOverBigInfo()) ? "超汛限的水库的大型水库有:" : "";
 		params.put("超汛限的水库的大型水库有", dxStr);
 		params.put("大型水库详情", overWord.getOverBigInfo());
+		String zxStr = StringUtil.isNotBlank(overWord.getOverMidInfo()) ? "超汛限的水库的中型水库有:" : "";
+		params.put("超汛限的水库的中型水库有", zxStr);
 		params.put("中型水库详情", overWord.getOverMidInfo());
 		params.put("省直水库详情", overWord.getProvinceInfo());
+		params.put("短信预警和外呼抽查", overWord.getSmsResultInfo());
 		//不在汛期内
 		if (!MyDateUtils.isTodayInFloodSeason()){
 			params.put("全省水库超正常", overWord.getTotalOverNormalInfo());
@@ -139,6 +143,13 @@
 			params.put("超正常中型水库详情", overWord.getOverNormalMidInfo());
 		}
 
+		//短信预警和外呼统计
+		//短信预警
+
+
+		//外呼统计
+
+
 		return params;
 	}
 

--
Gitblit v1.9.3