From a13b86f93a26301c4c233257fd335196514794b9 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 30 Jul 2024 10:13:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2087697=20=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9=E5=BA=93--=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=93=E4=B8=8D=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsEvaluationNotMetLibrary.java | 2 +- .../impl/LawsEvaluationNotMetLibraryServiceImpl.java | 2 +- .../com/jero/modules/laws/utils/ExcelExportUtilPro.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java index ecfb26d6..edf7fcdb 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsEvaluationNotMetLibrary.java @@ -222,7 +222,7 @@ public class LawsEvaluationNotMetLibrary implements Serializable { @ApiModelProperty(value = "附件") @ExcelCollection(name = "", orderNum = "13") @TableField(exist = false) - private List fileList = Collections.emptyList(); + private List fileList; public List obtainFileIds() { return file != null ? Arrays.asList(file.split(",")) : Collections.emptyList(); diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java index ded97f5b..9c9080ce 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java @@ -124,7 +124,7 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl newRecordsExport = new ArrayList<>(records); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, LawsEvaluationNotMetLibrary.class, records); // 生成超链接 - excelExportUtilPro.generateHyperlink(newRecordsExport, workbook, LawsEvaluationNotMetLibrary::getFileList, 15); + excelExportUtilPro.generateHyperlink(newRecordsExport, workbook, LawsEvaluationNotMetLibrary::getFileList, 12); // 导出excel workbook.write(fos); // 生成并导出zip diff --git a/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java b/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java index 5a3c98bf..5bd91c6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/utils/ExcelExportUtilPro.java @@ -1,12 +1,13 @@ package com.jero.modules.laws.utils; import com.jero.common.util.BeanCopyUtils; -import com.jero.common.util.MinioUtil; +import com.jero.common.util.obs.ObsBootUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.util.SysWaterMarkUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.usermodel.*; @@ -32,6 +33,7 @@ public class ExcelExportUtilPro { private SysWaterMarkUtil sysWaterMarkUtil; // 文件详细信息类 + @Setter @Getter public static class FileDetails { @ApiModelProperty(value = "id") @@ -85,7 +87,7 @@ public class ExcelExportUtilPro { List fileDetailsList = BeanCopyUtils.copyBeanList(ossFileList, FileDetails.class); fileDetailsConsumer.accept(item, fileDetailsList); for (OSSFile ossFile : ossFileList) { - InputStream inputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), ossFile.getUrl()); + InputStream inputStream = ObsBootUtil.getOssFile(ossFile.getUrl()); if (StringUtils.endsWithIgnoreCase(ossFile.getFileName(), ".pdf")) { inputStream = sysWaterMarkUtil.addWatermarkToPdf(inputStream); }