wangzaijun 16 órája
szülő
commit
622c61621a

+ 87 - 0
logs/error.log

@@ -0,0 +1,87 @@
+2025-06-27 09:43:53.045 [XNIO-1 task-2] - [] ERROR io.undertow.request:80   - UT005023: Exception handling request to /v1/daq-parse/upload-url-parse
+jakarta.servlet.ServletException: Request processing failed: cn.hutool.core.io.IORuntimeException: IOException: 文件名、目录名或卷标语法不正确。
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1022)
+	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:914)
+	at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:547)
+	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:885)
+	at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:614)
+	at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:129)
+	at com.smppw.modaq.infrastructure.components.RequestIdFilter.doFilter(RequestIdFilter.java:34)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at io.undertow.servlet.handlers.FilterHandler.handleRequest(FilterHandler.java:84)
+	at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62)
+	at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68)
+	at io.undertow.servlet.handlers.ServletDispatchingHandler.handleRequest(ServletDispatchingHandler.java:36)
+	at io.undertow.servlet.handlers.RedirectDirHandler.handleRequest(RedirectDirHandler.java:68)
+	at io.undertow.servlet.handlers.security.SSLInformationAssociationHandler.handleRequest(SSLInformationAssociationHandler.java:117)
+	at io.undertow.servlet.handlers.security.ServletAuthenticationCallHandler.handleRequest(ServletAuthenticationCallHandler.java:57)
+	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)
+	at io.undertow.security.handlers.AbstractConfidentialityHandler.handleRequest(AbstractConfidentialityHandler.java:46)
+	at io.undertow.servlet.handlers.security.ServletConfidentialityConstraintHandler.handleRequest(ServletConfidentialityConstraintHandler.java:64)
+	at io.undertow.security.handlers.AuthenticationMechanismsHandler.handleRequest(AuthenticationMechanismsHandler.java:60)
+	at io.undertow.servlet.handlers.security.CachedAuthenticatedSessionHandler.handleRequest(CachedAuthenticatedSessionHandler.java:77)
+	at io.undertow.security.handlers.AbstractSecurityContextAssociationHandler.handleRequest(AbstractSecurityContextAssociationHandler.java:43)
+	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)
+	at io.undertow.servlet.handlers.SendErrorPageHandler.handleRequest(SendErrorPageHandler.java:52)
+	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)
+	at io.undertow.servlet.handlers.ServletInitialHandler.handleFirstRequest(ServletInitialHandler.java:276)
+	at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:135)
+	at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:132)
+	at io.undertow.servlet.core.ServletRequestContextThreadSetupAction$1.call(ServletRequestContextThreadSetupAction.java:48)
+	at io.undertow.servlet.core.ContextClassLoaderSetupAction$1.call(ContextClassLoaderSetupAction.java:43)
+	at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:256)
+	at io.undertow.servlet.handlers.ServletInitialHandler$1.handleRequest(ServletInitialHandler.java:101)
+	at io.undertow.server.Connectors.executeRootHandler(Connectors.java:395)
+	at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:861)
+	at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18)
+	at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2513)
+	at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1512)
+	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
+	at java.base/java.lang.Thread.run(Thread.java:833)
+Caused by: cn.hutool.core.io.IORuntimeException: IOException: 文件名、目录名或卷标语法不正确。
+	at cn.hutool.core.io.FileUtil.getParent(FileUtil.java:3492)
+	at cn.hutool.core.io.FileUtil.mkParentDirs(FileUtil.java:715)
+	at cn.hutool.core.io.FileUtil.touch(FileUtil.java:668)
+	at cn.hutool.core.io.FileUtil.getOutputStream(FileUtil.java:2647)
+	at cn.hutool.http.HttpResponse.writeBody(HttpResponse.java:323)
+	at cn.hutool.http.HttpDownloader.downloadFile(HttpDownloader.java:67)
+	at cn.hutool.http.HttpUtil.downloadFile(HttpUtil.java:327)
+	at cn.hutool.http.HttpUtil.downloadFile(HttpUtil.java:313)
+	at cn.hutool.http.HttpUtil.downloadFile(HttpUtil.java:288)
+	at com.smppw.modaq.application.service.EmailParseApiServiceImpl.uploadUrlReport(EmailParseApiServiceImpl.java:117)
+	at com.smppw.modaq.application.api.ParseApi.uploadUrlReport(ParseApi.java:62)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:257)
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:190)
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:118)
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:986)
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:891)
+	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1088)
+	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:978)
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1014)
+	... 51 common frames omitted
+Caused by: java.io.IOException: 文件名、目录名或卷标语法不正确。
+	at java.base/java.io.WinNTFileSystem.canonicalize0(Native Method)
+	at java.base/java.io.WinNTFileSystem.canonicalize(WinNTFileSystem.java:462)
+	at java.base/java.io.File.getCanonicalPath(File.java:626)
+	at java.base/java.io.File.getCanonicalFile(File.java:651)
+	at cn.hutool.core.io.FileUtil.getParent(FileUtil.java:3490)
+	... 74 common frames omitted

+ 106 - 0
logs/info.log

@@ -0,0 +1,106 @@
+2025-06-27 09:40:06.249 [main] - [] INFO  com.smppw.modaq.MoDaqApplication:53   - Starting MoDaqApplication using Java 17.0.5 with PID 16212 (D:\Documents\Wrokspace\codes\mo-daq-all\mo-daq\target\classes started by Administrator in D:\Documents\Wrokspace\codes\mo-daq-all)
+2025-06-27 09:40:06.252 [main] - [] INFO  com.smppw.modaq.MoDaqApplication:652  - No active profile set, falling back to 1 default profile: "default"
+2025-06-27 09:40:07.674 [main] - [] WARN  io.undertow.websockets.jsr:68   - UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used
+2025-06-27 09:40:07.697 [main] - [] INFO  io.undertow.servlet:372  - Initializing Spring embedded WebApplicationContext
+2025-06-27 09:40:07.697 [main] - [] INFO  o.s.b.w.s.c.ServletWebServerApplicationContext:296  - Root WebApplicationContext: initialization completed in 1399 ms
+2025-06-27 09:40:08.658 [main] - [] INFO  com.zaxxer.hikari.HikariDataSource:109  - HikariCP-daq - Starting...
+2025-06-27 09:40:08.943 [main] - [] INFO  com.zaxxer.hikari.pool.HikariPool:554  - HikariCP-daq - Added connection com.mysql.cj.jdbc.ConnectionImpl@3e2c4d4b
+2025-06-27 09:40:08.945 [main] - [] INFO  com.zaxxer.hikari.HikariDataSource:122  - HikariCP-daq - Start completed.
+2025-06-27 09:40:09.501 [main] - [] INFO  io.undertow:120  - starting server: Undertow - 2.3.18.Final
+2025-06-27 09:40:09.510 [main] - [] INFO  org.xnio:95   - XNIO version 3.8.16.Final
+2025-06-27 09:40:09.518 [main] - [] INFO  org.xnio.nio:58   - XNIO NIO Implementation Version 3.8.16.Final
+2025-06-27 09:40:09.565 [main] - [] INFO  org.jboss.threads:55   - JBoss Threads version 3.5.0.Final
+2025-06-27 09:40:09.656 [main] - [] INFO  o.s.boot.web.embedded.undertow.UndertowWebServer:121  - Undertow started on port 9933 (http) with context path '/'
+2025-06-27 09:40:09.666 [main] - [] INFO  com.smppw.modaq.MoDaqApplication:59   - Started MoDaqApplication in 3.943 seconds (process running for 5.09)
+2025-06-27 09:43:52.566 [XNIO-1 task-2] - [] INFO  io.undertow.servlet:372  - Initializing Spring DispatcherServlet 'dispatcherServlet'
+2025-06-27 09:43:52.567 [XNIO-1 task-2] - [] INFO  org.springframework.web.servlet.DispatcherServlet:532  - Initializing Servlet 'dispatcherServlet'
+2025-06-27 09:43:52.568 [XNIO-1 task-2] - [] INFO  org.springframework.web.servlet.DispatcherServlet:554  - Completed initialization in 1 ms
+2025-06-27 09:43:53.045 [XNIO-1 task-2] - [] ERROR io.undertow.request:80   - UT005023: Exception handling request to /v1/daq-parse/upload-url-parse
+jakarta.servlet.ServletException: Request processing failed: cn.hutool.core.io.IORuntimeException: IOException: 文件名、目录名或卷标语法不正确。
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1022)
+	at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:914)
+	at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:547)
+	at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:885)
+	at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:614)
+	at io.undertow.servlet.handlers.ServletHandler.handleRequest(ServletHandler.java:74)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:129)
+	at com.smppw.modaq.infrastructure.components.RequestIdFilter.doFilter(RequestIdFilter.java:34)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
+	at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116)
+	at io.undertow.servlet.core.ManagedFilter.doFilter(ManagedFilter.java:67)
+	at io.undertow.servlet.handlers.FilterHandler$FilterChainImpl.doFilter(FilterHandler.java:131)
+	at io.undertow.servlet.handlers.FilterHandler.handleRequest(FilterHandler.java:84)
+	at io.undertow.servlet.handlers.security.ServletSecurityRoleHandler.handleRequest(ServletSecurityRoleHandler.java:62)
+	at io.undertow.servlet.handlers.ServletChain$1.handleRequest(ServletChain.java:68)
+	at io.undertow.servlet.handlers.ServletDispatchingHandler.handleRequest(ServletDispatchingHandler.java:36)
+	at io.undertow.servlet.handlers.RedirectDirHandler.handleRequest(RedirectDirHandler.java:68)
+	at io.undertow.servlet.handlers.security.SSLInformationAssociationHandler.handleRequest(SSLInformationAssociationHandler.java:117)
+	at io.undertow.servlet.handlers.security.ServletAuthenticationCallHandler.handleRequest(ServletAuthenticationCallHandler.java:57)
+	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)
+	at io.undertow.security.handlers.AbstractConfidentialityHandler.handleRequest(AbstractConfidentialityHandler.java:46)
+	at io.undertow.servlet.handlers.security.ServletConfidentialityConstraintHandler.handleRequest(ServletConfidentialityConstraintHandler.java:64)
+	at io.undertow.security.handlers.AuthenticationMechanismsHandler.handleRequest(AuthenticationMechanismsHandler.java:60)
+	at io.undertow.servlet.handlers.security.CachedAuthenticatedSessionHandler.handleRequest(CachedAuthenticatedSessionHandler.java:77)
+	at io.undertow.security.handlers.AbstractSecurityContextAssociationHandler.handleRequest(AbstractSecurityContextAssociationHandler.java:43)
+	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)
+	at io.undertow.servlet.handlers.SendErrorPageHandler.handleRequest(SendErrorPageHandler.java:52)
+	at io.undertow.server.handlers.PredicateHandler.handleRequest(PredicateHandler.java:43)
+	at io.undertow.servlet.handlers.ServletInitialHandler.handleFirstRequest(ServletInitialHandler.java:276)
+	at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:135)
+	at io.undertow.servlet.handlers.ServletInitialHandler$2.call(ServletInitialHandler.java:132)
+	at io.undertow.servlet.core.ServletRequestContextThreadSetupAction$1.call(ServletRequestContextThreadSetupAction.java:48)
+	at io.undertow.servlet.core.ContextClassLoaderSetupAction$1.call(ContextClassLoaderSetupAction.java:43)
+	at io.undertow.servlet.handlers.ServletInitialHandler.dispatchRequest(ServletInitialHandler.java:256)
+	at io.undertow.servlet.handlers.ServletInitialHandler$1.handleRequest(ServletInitialHandler.java:101)
+	at io.undertow.server.Connectors.executeRootHandler(Connectors.java:395)
+	at io.undertow.server.HttpServerExchange$1.run(HttpServerExchange.java:861)
+	at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18)
+	at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2513)
+	at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1512)
+	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
+	at java.base/java.lang.Thread.run(Thread.java:833)
+Caused by: cn.hutool.core.io.IORuntimeException: IOException: 文件名、目录名或卷标语法不正确。
+	at cn.hutool.core.io.FileUtil.getParent(FileUtil.java:3492)
+	at cn.hutool.core.io.FileUtil.mkParentDirs(FileUtil.java:715)
+	at cn.hutool.core.io.FileUtil.touch(FileUtil.java:668)
+	at cn.hutool.core.io.FileUtil.getOutputStream(FileUtil.java:2647)
+	at cn.hutool.http.HttpResponse.writeBody(HttpResponse.java:323)
+	at cn.hutool.http.HttpDownloader.downloadFile(HttpDownloader.java:67)
+	at cn.hutool.http.HttpUtil.downloadFile(HttpUtil.java:327)
+	at cn.hutool.http.HttpUtil.downloadFile(HttpUtil.java:313)
+	at cn.hutool.http.HttpUtil.downloadFile(HttpUtil.java:288)
+	at com.smppw.modaq.application.service.EmailParseApiServiceImpl.uploadUrlReport(EmailParseApiServiceImpl.java:117)
+	at com.smppw.modaq.application.api.ParseApi.uploadUrlReport(ParseApi.java:62)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
+	at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:257)
+	at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:190)
+	at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:118)
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:986)
+	at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:891)
+	at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
+	at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1088)
+	at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:978)
+	at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1014)
+	... 51 common frames omitted
+Caused by: java.io.IOException: 文件名、目录名或卷标语法不正确。
+	at java.base/java.io.WinNTFileSystem.canonicalize0(Native Method)
+	at java.base/java.io.WinNTFileSystem.canonicalize(WinNTFileSystem.java:462)
+	at java.base/java.io.File.getCanonicalPath(File.java:626)
+	at java.base/java.io.File.getCanonicalFile(File.java:651)
+	at cn.hutool.core.io.FileUtil.getParent(FileUtil.java:3490)
+	... 74 common frames omitted
+2025-06-27 09:44:00.120 [parse-scheduler-1] - [TASK-kKuyVvi6lXC9JmRAX6GvO] INFO  c.smppw.modaq.application.task.ParseSchedulerTask:80   - 任务mo_email_parse_letter_task 执行完成,耗时:36ms
+2025-06-27 09:44:56.414 [HikariCP-daq housekeeper] - [] WARN  com.zaxxer.hikari.pool.HikariPool:797  - HikariCP-daq - Thread starvation or clock leap detected (housekeeper delta=47s308ms506µs400ns).

+ 2 - 0
logs/warn.log

@@ -0,0 +1,2 @@
+2025-06-27 09:40:07.674 [main] - [] WARN  io.undertow.websockets.jsr:68   - UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used
+2025-06-27 09:44:56.414 [HikariCP-daq housekeeper] - [] WARN  com.zaxxer.hikari.pool.HikariPool:797  - HikariCP-daq - Thread starvation or clock leap detected (housekeeper delta=47s308ms506µs400ns).

+ 1 - 1
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);
             }

+ 3 - 13
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

+ 1 - 1
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));
             }
         }
         // 重新判断类型