diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 25a8220b54..a0c7d72136 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -138,6 +138,9 @@ true ${basedir}/src/main/resources + + **/* + diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 7f74cb1e5c..2e419c5953 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -36,10 +36,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.ClassPathResource; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; @@ -266,12 +266,12 @@ public class ScreenProjectController { } String templatePath = "excel/project_temp_easy_excel.xlsx"; - ClassPathResource classPathResource = new ClassPathResource(templatePath); - String template = classPathResource.getPath(); + InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath); + //String template = this.getClass().getResource(templatePath).getPath(); String fileName = "项目统计.xlsx"; - excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(template).build(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStream(fileName, response)).withTemplate(inputStream).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); excelWriter.fill(mapData, writeSheet);