Quellcode durchsuchen

fix:修复部分公告被定义为月报的问题

wangzaijun vor 1 Woche
Ursprung
Commit
af542e7c92

+ 4 - 0
mo-daq/src/main/java/com/smppw/modaq/application/components/ReportParseUtils.java

@@ -25,6 +25,10 @@ public final class ReportParseUtils {
             "投资者报告", "投资报告", "投资月报", "月度简报", "运行月报"
     );
 
+    public static final Set<String> MONTHLY_REPORT_KEYWORDS = Set.of(
+            "运行报告", "月策略", "投资者报告", "投资报告", "定期报告"
+    );
+
     /**
      * 基金基本信息表格列名称
      */

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

@@ -176,16 +176,10 @@ public class EmailParseService {
                 }
                 Integer type = EmailUtil.getEmailTypeBySubject(emailTitle + emailFile.getFilename());
                 // 特殊月报
-                if ((Objects.equals(EmailTypeConst.NAV_EMAIL_TYPE, type)
-                        || Objects.equals(EmailTypeConst.REPORT_OTHER_TYPE, type))
-                        && (ReportParseUtils.containsAny(emailTitle, ReportParseUtils.MANAGER_KEYWORDS)
-                        || emailTitle.contains("定期报告"))) {
+                if ((Objects.equals(EmailTypeConst.NAV_EMAIL_TYPE, type) || Objects.equals(EmailTypeConst.REPORT_OTHER_TYPE, type))
+                        && ReportParseUtils.containsAny(emailTitle, ReportParseUtils.MONTHLY_REPORT_KEYWORDS)) {
                     type = EmailTypeConst.REPORT_EMAIL_TYPE;
                 }
-                // 其他报告
-                if (Objects.equals(EmailTypeConst.NAV_EMAIL_TYPE, type)) {
-                    type = EmailTypeConst.REPORT_OTHER_TYPE;
-                }
                 emailFile.setEmailType(type);
             }
 

+ 3 - 3
mo-daq/src/test/java/com/smppw/modaq/MoDaqApplicationTests.java

@@ -41,9 +41,9 @@ public class MoDaqApplicationTests {
 
     @Test
     public void reportTest() {
-        MailboxInfoDTO emailInfoDTO = this.buildMailbox("**@simuwang.com", "**");
-        Date startDate = DateUtil.parse("2025-06-18 08:47:00", DateConst.YYYY_MM_DD_HH_MM_SS);
-        Date endDate = DateUtil.parse("2025-06-18 13:57:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        MailboxInfoDTO emailInfoDTO = this.buildMailbox("*@simuwang.com", "*");
+        Date startDate = DateUtil.parse("2025-06-19 08:47:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        Date endDate = DateUtil.parse("2025-06-19 13:57:00", DateConst.YYYY_MM_DD_HH_MM_SS);
         try {
             List<String> folderNames = ListUtil.list(false);
 //            folderNames.add("其他文件夹/报告公告");