Bläddra i källkod

fix:修复周报中基金编码解析的正则错误问题

wangzaijun 1 månad sedan
förälder
incheckning
997927f469

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

@@ -313,7 +313,7 @@ public final class ReportParseUtils {
         if (StrUtil.isBlank(text)) {
             return null;
         }
-        Pattern pattern = Pattern.compile("^S\\d{5,6}$");
+        Pattern pattern = Pattern.compile("S[A-Z0-9]{5}");
         Matcher matcher = pattern.matcher(text);
         if (matcher.find()) {
             return matcher.group();

+ 1 - 1
mo-daq/src/main/java/com/smppw/modaq/application/components/report/parser/ai/AIWeeklyReportParser.java

@@ -22,7 +22,7 @@ public class AIWeeklyReportParser extends AbstractAIReportParser<WeeklyReportDat
     protected String prompt() {
         return """
                 识别文件中的基金名称、基金编码、基金管理人和报告日期,
-                基金编码的正则表达式是`S\\d{5,6}`,
+                基金编码的正则表达式是`S[A-Z0-9]{5}`,
                 如果日期是区间段则取截止日期,如果无法识别就返回空字符串,结果用json返回
                 """;
     }

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

@@ -37,15 +37,15 @@ public class MoDaqApplicationTests {
 
     @Test
     public void reportTest() {
-        MailboxInfoDTO emailInfoDTO = this.buildMailbox("**@simuwang.com", "**");
-        Date startDate = DateUtil.parse("2025-05-09 09:55:00", DateConst.YYYY_MM_DD_HH_MM_SS);
+        MailboxInfoDTO emailInfoDTO = this.buildMailbox("*@simuwang.com", "**");
+        Date startDate = DateUtil.parse("2025-05-09 10:55:00", DateConst.YYYY_MM_DD_HH_MM_SS);
         Date endDate = DateUtil.parse("2025-05-09 19:55:05", DateConst.YYYY_MM_DD_HH_MM_SS);
         try {
             List<String> folderNames = ListUtil.list(false);
 //            folderNames.add("其他文件夹/报告公告");
             folderNames.add("INBOX");
             emailParseService.parseEmail(emailInfoDTO, startDate, endDate,
-                    folderNames, ListUtil.of(EmailTypeConst.REPORT_LETTER_EMAIL_TYPE));
+                    folderNames, EmailTypeConst.REPORT_EMAIL_TYPES);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }