From 94b98a4324e2197d4327e67a6b45508d390ecf45 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Thu, 10 Apr 2025 15:30:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E7=94=B5=E7=AB=99?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A4=9A=E5=AA=92=E4=BD=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatrolTaskResultMainController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index 5ba76ea..d115509 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -35,6 +35,8 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.function.IOConsumer; @@ -712,6 +714,23 @@ public class PatrolTaskResultMainController extends BaseController { inspectionReport.getInspectionStartTime() : new Date(); String timestamp = DateUtils.format(DateUtils.yyyyMMddHHmmss2, startTime) + "_" + System.currentTimeMillis(); String reportName = inspectionReport.getInspectionTaskName() + "_" + timestamp; + // 上传媒体包 + uploadFile(basePath, reportName, ".zip", outputStream -> { + try (ZipOutputStream zipOut = new ZipOutputStream(outputStream)) { + for (Map.Entry entry : streamHashMap.entrySet()) { + String imagePath = entry.getKey(); + byte[] imageData = entry.getValue(); + // 提取文件名并处理路径问题 + String fileName = new File(imagePath).getName(); + ZipEntry zipEntry = new ZipEntry(fileName); + zipOut.putNextEntry(zipEntry); + zipOut.write(imageData); + zipOut.closeEntry(); + } + } catch (IOException e) { + throw new RuntimeException("生成ZIP文件失败", e); + } + }); // 上传Excel uploadFile(basePath, reportName, ".xls", hssfWorkbook::write); // 上传Word From f486373a98f97c88502ed70479eccc5372c24af0 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Thu, 10 Apr 2025 15:33:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E7=94=B5=E7=AB=99?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A4=9A=E5=AA=92=E4=BD=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resultmain/controller/PatrolTaskResultMainController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index d115509..df925ec 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -1111,7 +1111,7 @@ public class PatrolTaskResultMainController extends BaseController { cella1.setCellValue(brr.getArea()); cella1.setCellStyle(colStyle2); cella1 = rowb1.createCell(2); - cella1.setCellValue(brr.getParts()); + cella1.setCellValue(brr.getEqName()); cella1.setCellStyle(colStyle2); cella1 = rowb1.createCell(3); cella1.setCellValue(brr.getEqName());