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/feign/SjztMdClientImpl.java | 34 +++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.xml | 5 +
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClient.java | 6 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java | 6 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/YwFloodReportInfoController.java | 38 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docx | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/YwFloodReportInfo.java | 25 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/WordUtil.java | 42 +++++++-
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClientFallback.java | 5 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java | 14 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 46 +++++---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java | 20 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java | 23 ++++
13 files changed, 235 insertions(+), 29 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClient.java
index 699563c..7cf707f 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClient.java
@@ -17,9 +17,15 @@
String GET_RESERVOIR_RAINFALL_FORECAST = API_PREFIX + "/getReservoirRainfallForecast";
+ //保存昨日报汛内容
+ String SAVE_YESTERDAY_FLOOD_REPORT_CONTENT = API_PREFIX + "/saveYesterdayFloodReportContent";
+
@GetMapping(GENERATE_DAY_REPORT_FLOOD)
String generateDayReportFlood(@RequestParam("isShow") String isShow) throws Exception;
+ @GetMapping(SAVE_YESTERDAY_FLOOD_REPORT_CONTENT)
+ String saveYesterdayFloodReportContent(@RequestParam("isShow") String isShow) throws Exception;
+
@GetMapping(GET_RESERVOIR_RAINFALL_FORECAST)
void getReservoirRainfallForecast(@RequestParam("dayIndexList") List<String> dayIndexList) throws Exception;
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClientFallback.java
index 1ba47ea..bc63913 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClientFallback.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/ISjztMdClientFallback.java
@@ -25,4 +25,9 @@
public void getReservoirRainfallForecast(List<String> dayIndexList) {
}
+
+ @Override
+ public String saveYesterdayFloodReportContent(String isShow) throws Exception {
+ return null;
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/YwFloodReportInfoController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/YwFloodReportInfoController.java
new file mode 100644
index 0000000..2378e4c
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/YwFloodReportInfoController.java
@@ -0,0 +1,38 @@
+package cn.gistack.sm.sjztmd.controller;
+
+import cn.gistack.sm.sjztmd.entity.TbResStagCapDisc;
+import cn.gistack.sm.sjztmd.feign.ISjztMdClient;
+import cn.gistack.sm.sjztmd.service.IYwFloodReportInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author AIX
+ * @Date 2024/7/8 12:49
+ * @Version 1.0
+ */
+@Slf4j
+@Api(tags = "每日报汛内容")
+@RestController
+@RequestMapping("/ywxt/ywFloodReportInfo")
+@AllArgsConstructor
+public class YwFloodReportInfoController {
+
+ @Autowired
+ private ISjztMdClient sjztMdClient;
+
+ @SneakyThrows
+ @GetMapping(value = "/addFloodReport")
+ public R getAll() {
+ sjztMdClient.saveYesterdayFloodReportContent("1");
+ return R.status(true);
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/YwFloodReportInfo.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/YwFloodReportInfo.java
new file mode 100644
index 0000000..9eb3515
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/YwFloodReportInfo.java
@@ -0,0 +1,25 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springblade.core.mp.base.BaseEntity;
+
+/**
+ * @Author AIX
+ * @Date 2024/7/8 12:34
+ * @Version 1.0
+ */
+@Data
+@TableName("YW_FLOOD_REPORT_INFO")
+@ApiModel(value = "每日报汛内容", description = "每日报汛内容对象")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class YwFloodReportInfo extends BaseEntity {
+
+ private String totalInfo;
+ private String oversmallInfo;
+
+}
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 7e72b88..0029c33 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
@@ -7,17 +7,18 @@
import cn.gistack.sm.intelligentCall.service.CallService;
import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
import cn.gistack.sm.sjztmd.entity.AttResBase;
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
import cn.gistack.sm.sjztmd.feign.IAttResBaseClient;
import cn.gistack.sm.sjztmd.feign.ISjztMdClient;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
+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.WordUtil;
-import cn.gistack.sm.sjztmd.word.vo.DzkInfo;
-import cn.gistack.sm.sjztmd.word.vo.OverDetail;
-import cn.gistack.sm.sjztmd.word.vo.SzInfo;
-import cn.gistack.sm.sjztmd.word.vo.TotalInfo;
+import cn.gistack.sm.sjztmd.word.vo.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.AllArgsConstructor;
+import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tenant.annotation.NonDS;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.MediaType;
@@ -51,6 +52,23 @@
private final ISmsRecordClient smsRecordClient;
private final CallService callService;
+
+ private final IYwFloodReportInfoService ywFloodReportInfoService;
+
+ @Override
+ public String saveYesterdayFloodReportContent(String isShow) throws Exception {
+ //获取总览、大中库、明细数据
+ List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
+ OverWord overWord = WordUtil.GetOverInfo(totalList);
+// bladeRedis.set("yesterDayFloodReport-totalinfo",overWord.getTotalInfo());
+// bladeRedis.set("yesterDayFloodReport-oversmallinfo",overWord.getOverSmallInfo());
+ YwFloodReportInfo info = new YwFloodReportInfo();
+ info.setCreateTime(new Date());
+ info.setTotalInfo(overWord.getTotalInfo());
+ info.setOversmallInfo(overWord.getOverSmallInfo());
+ ywFloodReportInfoService.save(info);
+ return "保存昨日报汛内容";
+ }
@Override
@GetMapping(GENERATE_DAY_REPORT_FLOOD)
@@ -98,9 +116,15 @@
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);
+ data = WordUtil.GetOverInfo(totalList, dzkList, overDetailList, szInfoList, dxyjList, whtjList, ywFloodReportInfo);
} else {
data = WordUtil.GetNotInSeasonOverInfo(totalList, dzkList, overDetailList, szInfoList, totalOverList, totalOver10List);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java
new file mode 100644
index 0000000..9f0e11e
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.java
@@ -0,0 +1,20 @@
+package cn.gistack.sm.sjztmd.mapper;
+
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @Author AIX
+ * @Date 2024/7/8 12:34
+ * @Version 1.0
+ */
+public interface YwFloodReportInfoMapper extends BaseMapper<YwFloodReportInfo> {
+
+ @Select("SELECT * FROM ywxt.yw_flood_report_info ORDER BY create_time DESC LIMIT 1")
+ YwFloodReportInfo getLatestReport(@Param(Constants.WRAPPER) QueryWrapper<YwFloodReportInfo> queryWrapper);
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.xml
new file mode 100644
index 0000000..4f43da1
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/YwFloodReportInfoMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.gistack.sm.sjztmd.mapper.YwFloodReportInfoMapper">
+
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java
new file mode 100644
index 0000000..41b623d
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IYwFloodReportInfoService.java
@@ -0,0 +1,14 @@
+package cn.gistack.sm.sjztmd.service;
+
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springblade.core.mp.base.BaseService;
+
+/**
+ * @Author AIX
+ * @Date 2024/7/8 12:44
+ * @Version 1.0
+ */
+public interface IYwFloodReportInfoService extends BaseService<YwFloodReportInfo> {
+ YwFloodReportInfo getLatestReport(QueryWrapper<YwFloodReportInfo> queryWrapper);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java
new file mode 100644
index 0000000..1f672d9
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/YwFloodReportInfoServiceImpl.java
@@ -0,0 +1,23 @@
+package cn.gistack.sm.sjztmd.service.impl;
+
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
+import cn.gistack.sm.sjztmd.mapper.YwFloodReportInfoMapper;
+import cn.gistack.sm.sjztmd.service.IYwFloodReportInfoService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author AIX
+ * @Date 2024/7/8 12:45
+ * @Version 1.0
+ */
+@Service
+@AllArgsConstructor
+public class YwFloodReportInfoServiceImpl extends BaseServiceImpl<YwFloodReportInfoMapper, YwFloodReportInfo> implements IYwFloodReportInfoService {
+ @Override
+ public YwFloodReportInfo getLatestReport(QueryWrapper<YwFloodReportInfo> queryWrapper) {
+ return baseMapper.getLatestReport(queryWrapper);
+ }
+}
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);
}
}
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 dece8fb..a2e3470 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
@@ -2,6 +2,7 @@
import cn.gistack.alerts.sms.vo.SmsResultVO;
import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
+import cn.gistack.sm.sjztmd.entity.YwFloodReportInfo;
import cn.gistack.sm.sjztmd.util.MyDateUtils;
import cn.gistack.sm.sjztmd.word.vo.*;
import com.deepoove.poi.XWPFTemplate;
@@ -89,11 +90,11 @@
}
- public static byte[] GetOverInfo(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> dxyjList, List<CallTaskResultVO> whtjList) throws Exception {
+ public static byte[] GetOverInfo(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> dxyjList, List<CallTaskResultVO> whtjList, YwFloodReportInfo ywFloodReportInfo) throws Exception {
InputStream inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/doc/overFloodTemplate.docx");
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- OverWord overWord = new OverWord(totalList, dzkList, overDetailList, szInfoList, dxyjList, whtjList,null);
- XWPFTemplate template = XWPFTemplate.compile(inputStream).render(createOverWordParam(overWord));
+ OverWord overWord = new OverWord(totalList, dzkList, overDetailList, szInfoList, dxyjList, whtjList, null);
+ XWPFTemplate template = XWPFTemplate.compile(inputStream).render(createOverWordParam(overWord, ywFloodReportInfo));
template.write(outputStream);
outputStream.flush();
outputStream.close();
@@ -144,12 +145,36 @@
params.put("超正常中型水库详情", overWord.getOverNormalMidInfo());
}
- //短信预警和外呼统计
- //短信预警
+ return params;
+ }
+ private static Map<String, Object> createOverWordParam(OverWord overWord, YwFloodReportInfo info) {
+ Map<String, Object> params = new HashMap<>();
- //外呼统计
+ params.put("时间", overWord.getTm());
+ params.put("全省水库超汛限", overWord.getTotalInfo());
+ params.put("小型水库详情", overWord.getOverSmallInfo());
+ 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());
+ params.put("重点水库详情", overWord.getZdInfo());
+ //不在汛期内
+ if (!MyDateUtils.isTodayInFloodSeason()) {
+ params.put("全省水库超正常", overWord.getTotalOverNormalInfo());
+ params.put("全省水库超正常十厘米以上", overWord.getTotalOverNormal10Info());
+ params.put("超正常小型水库详情", overWord.getOverNormalSmallInfo());
+ params.put("超正常大型水库详情", overWord.getOverNormalBigInfo());
+ params.put("超正常中型水库详情", overWord.getOverNormalMidInfo());
+ }
+ //昨日报汛
+ params.put("昨日全省水库超汛限", "昨日全省水库超汛限:" + info.getTotalInfo().replace("今日", "昨日"));
+ params.put("昨日超汛限的小型水库有", "昨日超汛限的小型水库有:" + info.getOversmallInfo());
return params;
}
@@ -165,4 +190,9 @@
}
+ public static OverWord GetOverInfo(List<TotalInfo> totalList) {
+
+ OverWord overWord = new OverWord(totalList);
+ return overWord;
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
index f40fe2e..65999d4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
@@ -57,6 +57,12 @@
formatSmsResultInfo(resultVOList, whtjList);
}
+ public OverWord(List<TotalInfo> totalList) {
+ this.tm = new SimpleDateFormat("MM月dd日H时").format(new Date());
+ this.hour = new SimpleDateFormat("H时").format(new Date());
+ formatTotalInfo(totalList);
+ }
+
private void formatSmsResultInfo(List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList) {
// 短信预警处理
int dxyjCount = 0;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docx b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docx
index 1f20397..97ac153 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docx
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/overFloodTemplate.docx
Binary files differ
--
Gitblit v1.9.3