Skip to content

fix(TAP-12724): [to main] Exclude cell type does not exist or unsupported type … #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarad0628 merged 1 commit into from
Aug 24, 2026
Merged

fix(TAP-12724): [to main] Exclude cell type does not exist or unsupported type … #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions connectors/excel-connector/src/main/java/io/tapdata/connector/excel/ExcelConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@
import org.apache.poi.xssf.usermodel.XSSFWorkbookFactory;

import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -99,13 +96,15 @@ protected void readOneFile(FileOffset fileOffset, TapTable tapTable, int eventBa
Cell cell = row.getCell(k);
checkCellType(k, cell, cellTypeMap);
String fieldName = (String) headers[k - excelConfig.getFirstColumn() + 1];
String fieldType = CellValueConvert.getFieldDataType(tapTable, fieldName);
Object val;
if (excelConfig.getJustString()) {
Object cellValue = ExcelUtil.getCellValue(cell, formulaEvaluator);
Object displayValue = ExcelUtil.getCellDisplayValue(cell, formulaEvaluator, dataFormatter);
val = CellValueConvert.parseValue(cellValue, displayValue, CellValueConvert.getFieldDataType(tapTable, fieldName));
val = CellValueConvert.parseValue(cellValue, displayValue, fieldType);
} else {
val = ExcelUtil.getCellValue(cell, formulaEvaluator);
Object cellValue = ExcelUtil.getCellValue(cell, formulaEvaluator);
val = CellValueConvert.parseOriginValue(cellValue, fieldType);
}
after.put(fieldName, val);
}
Expand All @@ -114,13 +113,15 @@ protected void readOneFile(FileOffset fileOffset, TapTable tapTable, int eventBa
Cell cell = row.getCell(k);
checkCellType(k, cell, cellTypeMap);
String fieldName = (String) headers[k - excelConfig.getFirstColumn() + 1];
String fieldType = CellValueConvert.getFieldDataType(tapTable, fieldName);
Object val;
if (excelConfig.getJustString()) {
Object cellValue = ExcelUtil.getMergedCellValue(mergedList, mergedDataMap, cell, formulaEvaluator);
Object displayValue = ExcelUtil.getMergedCellDisplayValue(mergedList, mergedDataMap, cell, formulaEvaluator, dataFormatter);
val = CellValueConvert.parseValue(cellValue, displayValue, CellValueConvert.getFieldDataType(tapTable, fieldName));
} else {
val = ExcelUtil.getMergedCellValue(mergedList, mergedDataMap, cell, formulaEvaluator);
Object cellValue = ExcelUtil.getMergedCellValue(mergedList, mergedDataMap, cell, formulaEvaluator);
val = CellValueConvert.parseOriginValue(cellValue, fieldType);
}
after.put(fieldName, val);
}
Expand Down
28 changes: 23 additions & 5 deletions ...ctors/excel-connector/src/main/java/io/tapdata/connector/excel/util/CellValueConvert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.tapdata.entity.schema.TapField;
import io.tapdata.entity.schema.TapTable;
import io.tapdata.kit.EmptyKit;
import org.apache.commons.lang3.StringUtils;

import java.math.BigDecimal;
import java.time.LocalDate;
Expand Down Expand Up @@ -40,6 +41,24 @@ public static String toExcelDataType(Object val) {
return val.getClass().getSimpleName().toUpperCase();
}

static Object stringValue(Object val) {
String temporalValue = formatTemporalValue(val);
if (temporalValue != null) {
return temporalValue;
}
return parseValue(val);
}

public static Object parseOriginValue(Object val, String fieldType) {
if (isStringField(fieldType)) {
return stringValue(val);
}
if (val instanceof String && StringUtils.isBlank((String) val)) {
return null;
}
return val;
}

public static Object parseValue(Object val) {
if (val instanceof Double || val instanceof Float || val instanceof Long) {
val = BigDecimal.valueOf(((Number) val).doubleValue()).stripTrailingZeros().toPlainString();
Expand All @@ -55,11 +74,10 @@ public static Object parseValue(Object val, String fieldDataType) {

public static Object parseValue(Object val, Object displayValue, String fieldDataType) {
if (isStringField(fieldDataType)) {
String temporalValue = formatTemporalValue(val);
if (temporalValue != null) {
return temporalValue;
}
return parseValue(displayValue);
return stringValue(val);
}
if (displayValue instanceof String && StringUtils.isBlank((String) displayValue)) {
return null;
}
return parseValue(val);
}
Expand Down
6 changes: 4 additions & 2 deletions connectors/excel-connector/src/main/java/io/tapdata/connector/excel/util/ExcelUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,20 @@ public static Object getCellValue(Cell cell, FormulaEvaluator formulaEvaluator)
case FORMULA:
return cell.getCellFormula();
case BLANK:
return "";
case ERROR:
case _NONE:
default:
return "";
return null;
}
}
return cell.getCellFormula();
case BLANK:
return "";
case ERROR:
case _NONE:
default:
return "";
return null;
}
}

Expand Down