diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml b/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml new file mode 100644 index 0000000..f3ab5b9 --- /dev/null +++ b/.idea/libraries/Maven__joda_time_joda_time_2_10_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d77b4e5 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue b/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue index 5fcf12e..a0393d1 100644 --- a/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue +++ b/admin-hanhai-vue/src/views/workorderTemplate/WorkorderTemplateList.vue @@ -4,11 +4,11 @@
- - - - - + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java index 1bde699..5d53c16 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/controller/WorkorderTemplateController.java @@ -1,13 +1,11 @@ package org.jeecg.modules.workorderTemplate.controller; -import java.io.File; +import java.io.*; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import javax.annotation.Resource; import javax.servlet.ServletException; @@ -200,9 +198,32 @@ public class WorkorderTemplateController extends JeecgController templateExport(HttpServletRequest request, HttpServletResponse response){ - String path = request.getParameter("fPath").replace("\\", "\\\\") + "\\\\"; + //String path = request.getParameter("fPath").replace("\\", "\\\\") + "\\\\"; + String path = "F:\\temp\\";//临时目录, 存储于服务器上 String templateId = request.getParameter("templateId"); - return workorderExcelService.templateExport(path, templateId); + workorderExcelService.templateExport(path, templateId); + + // 文件路径 + String filePath = path+templateId+".xlsx"; + File file = new File(filePath); + + // 设置响应头 + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader("Content-Disposition", "attachment; filename=output.xlsx"); + + // 读取文件并写入响应输出流 + try (FileInputStream fis = new FileInputStream(file); + OutputStream os = response.getOutputStream()) { + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = fis.read(buffer)) != -1) { + os.write(buffer, 0, bytesRead); + } + }catch (Exception e){ + e.printStackTrace(); + } + + return null; } }