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/word/controller/DownTemplateController.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 aa48cfb..0c4acc0 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
@@ -1,17 +1,19 @@
package cn.gistack.sm.sjztmd.word.controller;
-
import cn.gistack.alerts.sms.feign.ISmsRecordClient;
import cn.gistack.alerts.sms.vo.SmsResultVO;
import cn.gistack.sm.intelligentCall.service.CallService;
import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
+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.BriefReportUtil;
import cn.gistack.sm.sjztmd.word.util.ExcelUtil;
import cn.gistack.sm.sjztmd.word.util.WordUtil;
import cn.gistack.sm.sjztmd.word.vo.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.deepoove.poi.XWPFTemplate;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
@@ -57,6 +59,9 @@
private final ISmsRecordClient smsRecordClient;
private final CallService callService;
+
+ private final IYwFloodReportInfoService ywFloodReportInfoService;
+
@GetMapping(value = "/getBriefReport")
public R getBriefReport() {
//获取总览、大中库、明细数据
@@ -66,13 +71,13 @@
@GetMapping("/download/{resGuid}")
public ResponseEntity genera(HttpServletResponse response, @PathVariable String resGuid) throws Exception {
- HashMap<String,Object> obj = sjztmdService.getTbWordVO(resGuid);
+ HashMap<String, Object> obj = sjztmdService.getTbWordVO(resGuid);
TbWordVO tbWordVO = (TbWordVO) obj.get("tbWordVO");
- Map<String,Object> tableMap= (Map<String, Object>) obj.get("tableMap");
+ Map<String, Object> tableMap = (Map<String, Object>) obj.get("tableMap");
String fileName = resGuid + ".docx";
- byte[] data = WordUtil.compileTemplateAndRenderData(tbWordVO,tableMap);
+ byte[] data = WordUtil.compileTemplateAndRenderData(tbWordVO, tableMap);
// 创建响应实体并设置响应头，将输出流作为响应体返回给客户端
InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(data));
@@ -85,9 +90,9 @@
}
@GetMapping("/download/overFloodInfo")
- public ResponseEntity overFloodInfo(String isShow) throws Exception{
+ public ResponseEntity overFloodInfo(String isShow) throws Exception {
String time = new SimpleDateFormat("yyyy日MM月dd日HH时").format(new Date());
- String fileName = time+ "报汛文件.docx";
+ String fileName = time + "报汛文件.docx";
String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
//获取总览、大中库、明细数据
List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
@@ -116,28 +121,33 @@
CallTaskResultVO callTaskResult = new CallTaskResultVO();
callTaskResult.setStartTime(oneDayBefore.format(formatter2));
callTaskResult.setEndTime(now.format(formatter2));
- List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null,callTaskResult);
+ List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult);
- HashMap<String,String> over10Params = new HashMap<>();
+ 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");
over10Params.put("mid_start_stag", "0.1");
over10Params.put("big_start_stag", "0.1");
- HashMap<String,String> normalParams = new HashMap<>();
+ HashMap<String, String> normalParams = 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
normalParams.put("small_start_stag", "0");
normalParams.put("mid_start_stag", "0");
normalParams.put("big_start_stag", "0");
- List<TotalInfo> totalOverList = sjztmdService.getTotalOverInfo(isShow,normalParams);
- List<TotalInfo> totalOver10List = sjztmdService.getTotalOverInfo(isShow,over10Params);
- byte[] data = null;
- if (MyDateUtils.isTodayInFloodSeason()){
- data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList,dxyjList,whtjList);
- }else {
- data= WordUtil.GetNotInSeasonOverInfo(totalList,dzkList,overDetailList,szInfoList,totalOverList,totalOver10List);
+ 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, ywFloodReportInfo);
+ } else {
+ data = WordUtil.GetNotInSeasonOverInfo(totalList, dzkList, overDetailList, szInfoList, totalOverList, totalOver10List);
}
// 创建响应实体并设置响应头，将输出流作为响应体返回给客户端
@@ -151,14 +161,14 @@
}
@GetMapping("/download/getOverFloodInfoExcel")
- public void getOverFloodInfoExcel(HttpServletResponse response,String isShow) throws Exception {
+ public void getOverFloodInfoExcel(HttpServletResponse response, String isShow) throws Exception {
//获取总览、大中库、明细数据
List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
- ExcelUtil.generateExcel(response,totalList,dzkList,overDetailList);
+ ExcelUtil.generateExcel(response, totalList, dzkList, overDetailList);
}
}
--
Gitblit v1.9.3