mo-daq/src/main/java/com/smppw/modaq/application/service/EmailParseApiServiceImpl.java

@@ -105,7 +105,7 @@ public class EmailParseApiServiceImpl implements EmailParseApiService {
             String reportUrl = urlReportInfo.getReportUrl();
             String filename;
             if (StrUtil.isNotBlank(getFileExtension(urlReportInfo.getReportName()))) {
-                filename = reportUrl;
+                filename = urlReportInfo.getReportName();
             } else {
                 filename = urlReportInfo.getReportName() + "." + getFileExtension(reportUrl);
             }

mo-daq/src/main/java/com/smppw/modaq/domain/dto/EmailZipFileDTO.java

@@ -14,7 +14,6 @@ public class EmailZipFileDTO {
     private final String filepath;
     private final long fileSize;
     // pdf文件的密码（需要密码时）
-    @Setter
     private String pdfPwd;
     @Setter
     private Integer emailType;
@@ -34,16 +33,6 @@ public class EmailZipFileDTO {
         this.extName = FileUtil.extName(file);
     }
 
-    public EmailZipFileDTO(String emailTitle, String filename, String filepath, Integer emailType) {
-        File file = FileUtil.file(filepath);
-        this.emailTitle = emailTitle;
-        this.filepath = filepath;
-        this.emailType = emailType;
-        this.filename = filename;
-        this.fileSize = FileUtil.size(file);
-        this.extName = FileUtil.extName(file);
-    }
-
     public EmailZipFileDTO(String emailTitle, EmailContentInfoDTO emailDto) {
         this.emailTitle = emailTitle;
         this.filepath = emailDto.getFilePath();
@@ -55,13 +44,14 @@ public class EmailZipFileDTO {
     }
 
     public EmailZipFileDTO(String emailTitle, UploadReportParams.ReportInfo uploadReportInfo) {
+        File file = FileUtil.file(uploadReportInfo.getReportPath());
         this.emailTitle = emailTitle;
         this.filepath = uploadReportInfo.getReportPath();
         this.emailType = uploadReportInfo.getReportType();
         this.filename = uploadReportInfo.getReportName();
         this.pdfPwd = uploadReportInfo.getPdfPwd();
-        this.fileSize = FileUtil.size(FileUtil.file(this.filepath));
-        this.extName = FileUtil.extName(filepath);
+        this.fileSize = FileUtil.size(file);
+        this.extName = FileUtil.extName(file);
     }
 
     @Override

mo-daq/src/main/java/com/smppw/modaq/domain/service/EmailParseService.java

@@ -370,7 +370,7 @@ public class EmailParseService {
                     dataList.add(new ParseResult<>(ReportParseStatus.ARCHIVE_FAIL, reportData));
                 }
             } else {
-                dtos.add(new EmailZipFileDTO(emailTitle, e.getReportName(), reportPath, e.getReportType()));
+                dtos.add(new EmailZipFileDTO(emailTitle, e));
             }
         }
         // 重新判断类型