diff --git a/WebRoot/Excel/02ae5ca5-39ab-44a0-b352-c7204d89e0c1.xlsx b/WebRoot/Excel/02ae5ca5-39ab-44a0-b352-c7204d89e0c1.xlsx new file mode 100644 index 00000000..154e5183 Binary files /dev/null and b/WebRoot/Excel/02ae5ca5-39ab-44a0-b352-c7204d89e0c1.xlsx differ diff --git a/WebRoot/Excel/2a443af6-9f40-442f-acbf-be94e3f60372.xlsx b/WebRoot/Excel/2a443af6-9f40-442f-acbf-be94e3f60372.xlsx new file mode 100644 index 00000000..ac686d31 Binary files /dev/null and b/WebRoot/Excel/2a443af6-9f40-442f-acbf-be94e3f60372.xlsx differ diff --git a/WebRoot/Excel/321cdc1a-2d93-4489-8571-f7ab081fe6fc.xlsx b/WebRoot/Excel/321cdc1a-2d93-4489-8571-f7ab081fe6fc.xlsx new file mode 100644 index 00000000..ac686d31 Binary files /dev/null and b/WebRoot/Excel/321cdc1a-2d93-4489-8571-f7ab081fe6fc.xlsx differ diff --git a/WebRoot/Excel/4ca3fb91-76a2-497b-a696-7271267c0e16.xlsx b/WebRoot/Excel/4ca3fb91-76a2-497b-a696-7271267c0e16.xlsx new file mode 100644 index 00000000..621235c7 Binary files /dev/null and b/WebRoot/Excel/4ca3fb91-76a2-497b-a696-7271267c0e16.xlsx differ diff --git a/WebRoot/Excel/d1059512-388f-4db1-9313-aa2b53f57b0f.xlsx b/WebRoot/Excel/d1059512-388f-4db1-9313-aa2b53f57b0f.xlsx new file mode 100644 index 00000000..0e3e410a Binary files /dev/null and b/WebRoot/Excel/d1059512-388f-4db1-9313-aa2b53f57b0f.xlsx differ diff --git a/WebRoot/Excel/f45b360c-1921-4dee-b7ab-c18b6f135c88.xlsx b/WebRoot/Excel/f45b360c-1921-4dee-b7ab-c18b6f135c88.xlsx new file mode 100644 index 00000000..154e5183 Binary files /dev/null and b/WebRoot/Excel/f45b360c-1921-4dee-b7ab-c18b6f135c88.xlsx differ diff --git a/WebRoot/Excel/f6187da5-3dec-4d07-9123-8010ad93c4d9.xlsx b/WebRoot/Excel/f6187da5-3dec-4d07-9123-8010ad93c4d9.xlsx new file mode 100644 index 00000000..0e3e410a Binary files /dev/null and b/WebRoot/Excel/f6187da5-3dec-4d07-9123-8010ad93c4d9.xlsx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java index cfe95585..63fd1f1e 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -671,6 +671,7 @@ public class CollectModel { for (int colNum = 0; colNum < ed.getLastCellNum(); colNum++) { if (StrKit.isBlank(ed.getCell(colNum).toString())) {//下面没有,应该听上面的 original_name = CommonUtil.removeKuoHao(st.getCell(colNum).toString().replace("\n", "")); + if (StrKit.isBlank(original_name)) continue; column_name = ChineseCharacterUtil.getColumnNameByMemo(CommonUtil.removeKuoHao(st.getCell(colNum).toString())); Record record = new Record(); record.set("original_name", original_name); diff --git a/src/main/java/com/dsideal/QingLong/Util/ChineseCharacterUtil.java b/src/main/java/com/dsideal/QingLong/Util/ChineseCharacterUtil.java index acf377b7..ebdb7142 100644 --- a/src/main/java/com/dsideal/QingLong/Util/ChineseCharacterUtil.java +++ b/src/main/java/com/dsideal/QingLong/Util/ChineseCharacterUtil.java @@ -118,9 +118,13 @@ public class ChineseCharacterUtil { else res = convertHanzi2Pinyin(memo, false); - res=res.replace("\n", "").trim().replace("/", "_"); - res=res.replace("(",""); - res=res.replace(")",""); + res = res.replace("\n", "").trim().replace("/", "_"); + res = res.replace("(", ""); + res = res.replace(")", ""); + // 正则表达式,匹配非字母、数字、下划线的字符 + String regex = "[^a-zA-Z0-9_]"; + // 使用replaceAll方法替换匹配的字符为空字符串,即删除这些字符 + res = res.replaceAll(regex, ""); return res; } }