From 0bdd1bda41e6fa8436d070b1f4e5b1f19f86d9d8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 27 Feb 2024 14:34:46 +0800
Subject: [PATCH] Merge branch 'jtdev' into 20240222-patrol
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 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 3d67b66..6c7ca14 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,7 @@
+import cn.gistack.sm.sjztmd.util.MyDateUtils;
import cn.gistack.sm.sjztmd.word.service.ISjztmdService;
import cn.gistack.sm.sjztmd.word.util.ExcelUtil;
import cn.gistack.sm.sjztmd.word.util.WordUtil;
@@ -44,10 +45,13 @@
@GetMapping("/download/{resGuid}")
public ResponseEntity genera(HttpServletResponse response, @PathVariable String resGuid) throws Exception {
- TbWordVO tbWordVO = 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");
String fileName = resGuid + ".docx";
- byte[] data = WordUtil.compileTemplateAndRenderData(tbWordVO);
+ byte[] data = WordUtil.compileTemplateAndRenderData(tbWordVO,tableMap);
// 创建响应实体并设置响应头，将输出流作为响应体返回给客户端
InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(data));
@@ -60,35 +64,55 @@
}
@GetMapping("/download/overFloodInfo")
- public ResponseEntity overFloodInfo() throws Exception{
+ public ResponseEntity overFloodInfo(String isShow) throws Exception{
String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
String fileName = time+ "全省水库防汛情况.docx";
String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
//获取总览、大中库、明细数据
- List<TotalInfo> totalList = sjztmdService.getTotalInfo();
- List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
- List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
- List<SzInfo> szInfoList = sjztmdService.getSzInfo();
+ List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
+ List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
+ List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
+ List<SzInfo> szInfoList = sjztmdService.getSzInfo(isShow);
- byte[] data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);
+ 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", "10");
+ over10Params.put("mid_start_stag", "10");
+ over10Params.put("big_start_stag", "10");
+ 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);
+ }else {
+ data= WordUtil.GetNotInSeasonOverInfo(totalList,dzkList,overDetailList,szInfoList,totalOverList,totalOver10List);
+
+ }
// 创建响应实体并设置响应头，将输出流作为响应体返回给客户端
InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(data));
// 将临时文件添加到响应中，以便用户下载
return ResponseEntity.ok()
- .contentType(MediaType.APPLICATION_OCTET_STREAM) // 设置响应的内容类型为二进制流（octet stream）
+ .contentType(MediaType.valueOf("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) // 设置响应的内容类型为二进制流（octet stream）
.header("Content-Disposition", "attachment; filename=\"" + fileNameURL) // 设置响应的Content-Disposition头，以便浏览器提示用户下载文件
.body(resource); // 将InputStreamResource对象作为响应体
}
@GetMapping("/download/getOverFloodInfoExcel")
- public void getOverFloodInfoExcel(HttpServletResponse response) throws Exception {
+ public void getOverFloodInfoExcel(HttpServletResponse response,String isShow) throws Exception {
//获取总览、大中库、明细数据
- List<TotalInfo> totalList = sjztmdService.getTotalInfo();
- List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
- List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
+ List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
+ List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
+ List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
ExcelUtil.generateExcel(response,totalList,dzkList,overDetailList);
}
--
Gitblit v1.9.3