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:
+5
-1
@@ -101,7 +101,11 @@ public class PublishWorkbookService {
|
||||
try (FileOutputStream output = new FileOutputStream(outputFile)) {
|
||||
CellStyle headerStyle = createHeaderStyle(workbook);
|
||||
String country = countrySheetName(publishCountry);
|
||||
Sheet sheet = workbook.createSheet(country);
|
||||
// 工作表名必须是 Excel 合法名(≤31 字符、不含 []:*?/\ ),而 country 来自接口参数,
|
||||
// 用户填了长文本/特殊字符时直接 createSheet 会抛异常导致"生成上架结果 Excel 失败"。
|
||||
// uniqueSheetName 是项目内已有的净化样板(dedupe 同款 WorkbookUtil.createSafeSheetName),
|
||||
// 此处只净化工作表名;单元格里的国家值仍按原口径写入。
|
||||
Sheet sheet = workbook.createSheet(uniqueSheetName(country, new LinkedHashSet<>()));
|
||||
writeSheet(sheet, rows, headerStyle, country);
|
||||
workbook.write(output);
|
||||
return outputFile;
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
-- 去重总数据表:用户导入列放宽(2026-09-25,与 V134 同口径)
|
||||
-- 去重「总数据导入」入口 importFromExcel 是用户上传 Excel(按表头取 ASIN 列,可选国家列),
|
||||
-- 逐行写入 data_value;varchar(128) 遇到超长值同样 Data too long 致导入整体失败
|
||||
-- (前端只见到"导入 Excel 失败",无从自查)。
|
||||
-- data_value 带唯一索引 uk_data_value(去重判重的核心 + 并发导入的兜底),
|
||||
-- 不能改成前缀索引——前缀唯一索引会把"前 N 字符相同"的不同值误判为重复,破坏去重语义;
|
||||
-- 故扩到 varchar(512)(utf8mb4 下索引键 2048 字节,仍在 InnoDB DYNAMIC 3072 字节上限内)。
|
||||
-- country 无索引,同口径放宽。
|
||||
ALTER TABLE biz_dedupe_total_data
|
||||
MODIFY COLUMN data_value VARCHAR(512) NOT NULL COMMENT '去重总数据值',
|
||||
MODIFY COLUMN country VARCHAR(512) NULL COMMENT '国家';
|
||||
+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