|
@@ -92,6 +92,8 @@ public class EmailParseService {
|
|
private ReportParserFactory reportParserFactory;
|
|
private ReportParserFactory reportParserFactory;
|
|
@Autowired
|
|
@Autowired
|
|
private ReportWriterFactory reportWriterFactory;
|
|
private ReportWriterFactory reportWriterFactory;
|
|
|
|
+ @Autowired
|
|
|
|
+ ReadEmailService readEmailService;
|
|
|
|
|
|
public EmailParseService(EmailTypeRuleMapper emailTypeRuleMapper, EmailRuleConfig emailRuleConfig,
|
|
public EmailParseService(EmailTypeRuleMapper emailTypeRuleMapper, EmailRuleConfig emailRuleConfig,
|
|
EmailFieldMappingMapper emailFieldMapper, EmailParserFactory emailParserFactory,
|
|
EmailFieldMappingMapper emailFieldMapper, EmailParserFactory emailParserFactory,
|
|
@@ -136,7 +138,8 @@ public class EmailParseService {
|
|
Map<String, List<String>> emailFieldMap = getEmailFieldMapping();
|
|
Map<String, List<String>> emailFieldMap = getEmailFieldMapping();
|
|
Map<String, List<EmailContentInfoDTO>> emailContentMap;
|
|
Map<String, List<EmailContentInfoDTO>> emailContentMap;
|
|
try {
|
|
try {
|
|
- emailContentMap = realEmail(mailboxInfoDTO, emailTypeMap, startDate, endDate);
|
|
|
|
|
|
+ // 通过接口获取邮件
|
|
|
|
+ emailContentMap = readEmailService.realEmail(mailboxInfoDTO, emailTypeMap, startDate, endDate);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.info("采集邮件失败 -> 邮箱配置信息:{},堆栈信息:{}", mailboxInfoDTO, ExceptionUtil.stacktraceToString(e));
|
|
log.info("采集邮件失败 -> 邮箱配置信息:{},堆栈信息:{}", mailboxInfoDTO, ExceptionUtil.stacktraceToString(e));
|
|
return;
|
|
return;
|