Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ protected void readOneFile(FileOffset fileOffset, TapTable tapTable, int eventBa
List<Integer> sheets = sheetNumbers.stream().filter(n -> n >= fileOffset.getSheetNum()).collect(Collectors.toList());
for (int i = 0; isAlive() && i < sheets.size(); i++) {
Sheet sheet = wb.getSheetAt(sheets.get(i) - 1);
String sheetName = sheet.getSheetName();
List<CellRangeAddress> mergedList = sheet.getMergedRegions();
int lastMergedRow = mergedList.stream().map(CellRangeAddressBase::getLastRow).max(Comparator.naturalOrder()).orElse(-1);
Map<CellRangeAddress, Cell> mergedDataMap = ExcelUtil.getMergedDataMap(sheet);
Expand Down Expand Up @@ -112,6 +113,7 @@ protected void readOneFile(FileOffset fileOffset, TapTable tapTable, int eventBa
recordEvent.addInfo("lastModified", lastModified);
recordEvent.addInfo("filePath", fileOffset.getPath());
recordEvent.addInfo("fileName", fileOffset.getPath().substring(fileOffset.getPath().lastIndexOf("/") + 1));
recordEvent.addInfo("sheetName", sheetName);
tapEvents.get().add(recordEvent);
if (tapEvents.get().size() == eventBatchSize) {
fileOffset.setDataLine(fileOffset.getDataLine() + eventBatchSize);
Expand All @@ -137,7 +139,7 @@ private void checkCellType(Integer col, Cell cell, Map<Integer, CellType> cellTy
}
CellType cellType = cellTypeMap.get(col);
if (checkLevel(cellType) != checkLevel(cell.getCellType())) {
tapLogger.info(String.format("The data type of line %s, column %s is inconsistent, please check the data in the excel file", cell.getRowIndex() + 1, col + 1));
// tapLogger.info(String.format("The data type of line %s, column %s is inconsistent, please check the data in the excel file", cell.getRowIndex() + 1, col + 1));
}
}

Expand Down