fix(上架/去重): 结果工作表名净化 + 总数据表用户导入列放宽
1) 上架结果 Excel 的工作表名取自接口参数 publishCountry:用户填长文本/特殊 字符(Excel 工作表名上限 31 字符且禁 []:*?/\)时 createSheet 直接抛异常, 整体表现为「生成上架结果 Excel 失败」。改用项目既有的 uniqueSheetName (内部即 WorkbookUtil.createSafeSheetName,与 dedupe 同款);单元格里的 国家值仍按原口径写入,不改变数据语义。 2) V135:去重「总数据导入」importFromExcel 是用户上传 Excel 逐行写 biz_dedupe_total_data.data_value(varchar(128)),超长值同样 Data too long 致导入整体失败。data_value 带唯一索引 uk_data_value(去重判重核心), 不能改前缀索引(会把前 N 字符相同的不同值误判为重复),故扩到 varchar(512);country 同口径放宽。线上已于 2026-09-25 手工执行(0.01s, 主从已生效并实测 210 字符写入)。
This commit is contained in:
+36
@@ -109,6 +109,42 @@ class PublishWorkbookServiceTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void writeWorkbookSanitizesIllegalSheetNameButKeepsCellValue() throws Exception {
|
||||
Path directory = Files.createTempDirectory("publish-sheet-name-");
|
||||
try {
|
||||
File output = directory.resolve("result.xlsx").toFile();
|
||||
// 用户在国家列填了超长且含 Excel 工作表非法字符([]:*?/\)的值:
|
||||
// 直接 createSheet 会抛异常导致「生成上架结果 Excel 失败」,应净化工作表名后正常生成。
|
||||
String illegalCountry = "英国/法国[港台]:德国*意大利" + "超长测试".repeat(10);
|
||||
service.writeWorkbook(output, List.of(row("1", "B001", "UK", "50")), illegalCountry);
|
||||
|
||||
try (FileInputStream input = new FileInputStream(output);
|
||||
Workbook workbook = new XSSFWorkbook(input)) {
|
||||
assertEquals(1, workbook.getNumberOfSheets());
|
||||
String sheetName = workbook.getSheetName(0);
|
||||
assertTrue(sheetName.length() <= 31, "工作表名超过 31 字符: " + sheetName);
|
||||
for (char illegal : new char[]{'[', ']', ':', '*', '?', '/', '\\'}) {
|
||||
assertTrue(sheetName.indexOf(illegal) < 0,
|
||||
"工作表名含非法字符 " + illegal + ": " + sheetName);
|
||||
}
|
||||
// 单元格里的国家值仍按原口径写入(不因工作表名净化而改变)
|
||||
assertEquals(illegalCountry,
|
||||
workbook.getSheetAt(0).getRow(1).getCell(2).getStringCellValue());
|
||||
}
|
||||
|
||||
// 值全为非法字符时兜底为「未分国家」,不再抛异常
|
||||
File fallback = directory.resolve("fallback.xlsx").toFile();
|
||||
service.writeWorkbook(fallback, List.of(row("1", "B001", "UK", "50")), "///");
|
||||
try (FileInputStream input = new FileInputStream(fallback);
|
||||
Workbook workbook = new XSSFWorkbook(input)) {
|
||||
assertEquals("未分国家", workbook.getSheetName(0));
|
||||
}
|
||||
} finally {
|
||||
FileUtil.del(directory.toFile());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void packagingDecisionUsesOriginalSourceFileCount() throws Exception {
|
||||
Path directory = Files.createTempDirectory("publish-package-");
|
||||
|
||||
Reference in New Issue
Block a user