|
@@ -600,15 +600,12 @@ public class EmailParseService {
|
|
|
result = new ParseResult<>(ReportParseStatus.PARSE_FAIL, null, e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
- if (log.isInfoEnabled()) {
|
|
|
- log.info("报告{} 用ocr补充解析结果。补充前的结果是:\n{}", fileName, reportData);
|
|
|
- }
|
|
|
- // ocr信息提取(印章、联系人、基金名称和产品代码)
|
|
|
- this.ocrReportData(reportType, reportData, fileName, images);
|
|
|
// 设置月报类型
|
|
|
if (reportData != null && reportData.getBaseInfo() != null) {
|
|
|
reportData.getBaseInfo().setMonthlyType(monthlyType.getType());
|
|
|
}
|
|
|
+ // ocr信息提取(印章、联系人、基金名称和产品代码)
|
|
|
+ this.ocrReportData(reportType, reportData, fileName, images);
|
|
|
if (log.isInfoEnabled()) {
|
|
|
log.info("报告{} 解析耗时{}ms,结果是:\n{}", fileName, (System.currentTimeMillis() - start), reportData);
|
|
|
}
|
|
@@ -683,6 +680,9 @@ public class EmailParseService {
|
|
|
if (reportData == null || CollUtil.isEmpty(images)) {
|
|
|
return;
|
|
|
}
|
|
|
+ if (log.isInfoEnabled()) {
|
|
|
+ log.info("报告{} 用ocr补充解析结果。补充前的结果是:\n{}", fileName, reportData);
|
|
|
+ }
|
|
|
// 报告才识别尾页的印章和联系人,确认单不识别尾页
|
|
|
if (ReportType.LETTER != reportType) {
|
|
|
OCRParseData parseRes = null;
|