From 2dd2e7f54db7149965acaa11d933f85b31fbd59c Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Tue, 19 Dec 2023 16:54:00 +0800
Subject: [PATCH] 解决验收过程中出现的问题
---
src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
index 28b8834..b22477b 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
@@ -1,6 +1,7 @@
package com.gkhy.fourierSpecialGasMonitor.schedule;
import com.alibaba.fastjson.JSON;
+import com.gkhy.fourierSpecialGasMonitor.Application;
import com.gkhy.fourierSpecialGasMonitor.commons.enums.ForeignResultCode;
import com.gkhy.fourierSpecialGasMonitor.commons.enums.ResultCode;
import com.gkhy.fourierSpecialGasMonitor.commons.exception.BusinessException;
@@ -26,6 +27,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -39,6 +42,7 @@
import javax.xml.parsers.ParserConfigurationException;
import java.io.*;
import java.lang.reflect.Field;
+import java.net.URL;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -98,18 +102,38 @@
//加载文档
XWPFDocument doc = null;
try {
- FileInputStream originalFileInputStream = new FileInputStream("src/main/resources/template/dailyReportTemplate.docx");
- FileOutputStream copyFileOutputStream = new FileOutputStream("src/main/resources/temp/dailyReportTemplate.docx");
- // 创建副本文件
+ ClassLoader classLoader = Application.class.getClassLoader();
+ InputStream originalFileInputStream = classLoader.getResourceAsStream("template/dailyReportTemplate.docx");
+ String copyFileUrl = reportFilePathConfig.getDcPath()+"temp/dailyReportTemplate.docx";
+ File file = new File(copyFileUrl);
+ if (!file.exists()){
+ try {
+ // 获取文件所在的文件夹路径
+ String folderPath = file.getParent();
+ // 创建文件夹（包括父目录）
+ File folder = new File(folderPath);
+ if (!folder.exists()){
+ folder.mkdirs();
+ }
+ file.createNewFile();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ FileOutputStream copyFileOutputStream = new FileOutputStream(copyFileUrl);
IOUtils.copy(originalFileInputStream, copyFileOutputStream);
- opcPackage = POIXMLDocument.openPackage("src/main/resources/temp/dailyReportTemplate.docx");
+ opcPackage = POIXMLDocument.openPackage(copyFileUrl);
+
+ //FileInputStream originalFileInputStream = new FileInputStream("src/main/resources/template/dailyReportTemplate.docx");
+ //FileOutputStream copyFileOutputStream = new FileOutputStream("src/main/resources/temp/dailyReportTemplate.docx");
+ //// 创建副本文件
+ //IOUtils.copy(originalFileInputStream, copyFileOutputStream);
+ //opcPackage = POIXMLDocument.openPackage("src/main/resources/temp/dailyReportTemplate.docx");
doc = new XWPFDocument(opcPackage);
} catch (IOException e) {
e.printStackTrace();
}
-
Map<String, Object> map = dataMap(gasCategories);
-
List<XWPFParagraph> paragraphList = doc.getParagraphs();
for (XWPFParagraph par : paragraphList) {
//获取段落的文本对象
@@ -173,8 +197,8 @@
drawLineChart(gasConcentrations, fileurl, series, title, gasCategories.get(i).getMolecularFormula(), i);
}
}
-
- List<GasFlux> gasFluxes = gasFluxService.listYesterday();
+ //List<GasFlux> gasFluxes = gasFluxService.listYesterday();
+ List<GasFlux> gasFluxes = gasFluxService.listYesterdayTenAmToSixPm();
List<Integer> areaNum = gasFluxes.stream().map(GasFlux::getAreaId).distinct().collect(Collectors.toList());
List<Region> allRegion = regionService.findAll();
--
Gitblit v1.9.2