1
0
Pārlūkot izejas kodu

feat:邮件解析-增加邮件解析参数日志

mozuwen 7 mēneši atpakaļ
vecāks
revīzija
585a4c3346

+ 4 - 4
service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -89,6 +89,7 @@ public class EmailParseService {
      * @param endDate        邮件截止日期(yyyy-MM-dd HH:mm:ss, 为null,将解析邮件日期小于等于startDate的当天邮件)
      */
     public void parseEmail(MailboxInfoDTO mailboxInfoDTO, Date startDate, Date endDate) {
+        log.info("开始邮件解析 -> 邮箱信息:{},开始时间:{},结束时间:{}", mailboxInfoDTO, DateUtil.format(startDate, DateConst.YYYY_MM_DD_HH_MM_SS), DateUtil.format(endDate, DateConst.YYYY_MM_DD_HH_MM_SS));
         // 邮件类型配置
         Map<Integer, List<String>> emailTypeMap = getEmailType();
         // 邮件字段识别映射表
@@ -120,6 +121,7 @@ public class EmailParseService {
             }
             // 保存相关信息 -> 邮件信息表,邮件文件表,邮件净值表,邮件规模表,基金净值表
             saveRelatedTable(mailboxInfoDTO.getAccount(), emailContentInfoDTOList, fileNameNavMap);
+            log.info("结束邮件解析 -> 邮箱信息:{},开始时间:{},结束时间:{}", mailboxInfoDTO, DateUtil.format(startDate, DateConst.YYYY_MM_DD_HH_MM_SS), DateUtil.format(endDate, DateConst.YYYY_MM_DD_HH_MM_SS));
         }
     }
 
@@ -559,19 +561,17 @@ public class EmailParseService {
     }
 
     private Message[] getEmailMessage(Folder folder, String protocol, Date startDate) {
-        Message[] messages;
         try {
             if (protocol.contains("imap")) {
                 // 获取邮件日期大于等于startDate的邮件(搜索条件只支持按天)
                 SearchTerm startDateTerm = new ReceivedDateTerm(ComparisonTerm.GE, startDate);
-                messages = folder.search(startDateTerm);
+                return folder.search(startDateTerm);
             } else {
-                messages = folder.getMessages();
+                return folder.getMessages();
             }
         } catch (MessagingException e) {
             throw new RuntimeException(e);
         }
-        return messages;
     }
 
 }