|
@@ -48,18 +48,18 @@ public class PDLetterReportParser extends AbstractPDReportParser<LetterReportDat
|
|
} else {
|
|
} else {
|
|
this.parseHisTable(colCount, table, 1, this.allInfoMap);
|
|
this.parseHisTable(colCount, table, 1, this.allInfoMap);
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- // 每行的单数列是键,偶数列是值(4列或者2列的表格)
|
|
|
|
- for (int i = 0; i < rowCount; i++) {
|
|
|
|
- int t = colCount / 2;
|
|
|
|
- for (int j = 0; j < t; j++) {
|
|
|
|
- String key = ReportParseUtils.cleaningValue(table.getCell(i, j * 2).getText());
|
|
|
|
- if (StrUtil.isBlank(key)) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- String value = table.getCell(i, j * 2 + 1).getText();
|
|
|
|
- this.allInfoMap.put(key, ReportParseUtils.cleaningValue(value, false));
|
|
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ // 每行的单数列是键,偶数列是值(4列或者2列的表格)
|
|
|
|
+ for (int i = 0; i < rowCount; i++) {
|
|
|
|
+ int t = colCount / 2;
|
|
|
|
+ for (int j = 0; j < t; j++) {
|
|
|
|
+ String key = ReportParseUtils.cleaningValue(table.getCell(i, j * 2).getText());
|
|
|
|
+ if (StrUtil.isBlank(key)) {
|
|
|
|
+ continue;
|
|
}
|
|
}
|
|
|
|
+ String value = table.getCell(i, j * 2 + 1).getText();
|
|
|
|
+ this.allInfoMap.put(key, ReportParseUtils.cleaningValue(value, false));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -85,7 +85,7 @@ public class PDLetterReportParser extends AbstractPDReportParser<LetterReportDat
|
|
protected LetterReportData parseExtInfoAndSetData(ReportBaseInfoDTO reportInfo, ReportFundInfoDTO fundInfo) {
|
|
protected LetterReportData parseExtInfoAndSetData(ReportBaseInfoDTO reportInfo, ReportFundInfoDTO fundInfo) {
|
|
Integer fileId = reportInfo.getFileId();
|
|
Integer fileId = reportInfo.getFileId();
|
|
if (this.logger.isInfoEnabled()) {
|
|
if (this.logger.isInfoEnabled()) {
|
|
- this.logger.info("文件{} 解析的内容是:{}", fileId, this.allInfoMap);
|
|
|
|
|
|
+ this.logger.info("文件{},是否AI解析{}, 解析的内容是:{}", fileId, this.aiParse, this.allInfoMap);
|
|
}
|
|
}
|
|
// 投资者信息
|
|
// 投资者信息
|
|
ReportInvestorInfoDTO investorInfo = this.buildDto(fileId, ReportInvestorInfoDTO.class, this.allInfoMap);
|
|
ReportInvestorInfoDTO investorInfo = this.buildDto(fileId, ReportInvestorInfoDTO.class, this.allInfoMap);
|