|
@@ -38,8 +38,8 @@ public class MongoExcelService {
|
|
aliasField = aliasField.replace("(", "(");
|
|
aliasField = aliasField.replace("(", "(");
|
|
aliasField = aliasField.replace(")", ")");
|
|
aliasField = aliasField.replace(")", ")");
|
|
headerDefined.put(aliasField, i);
|
|
headerDefined.put(aliasField, i);
|
|
- headerTransfer.put(aliasField, value);
|
|
|
|
- headerTransferReverse.put(value, aliasField);
|
|
|
|
|
|
+ headerTransfer.put(aliasField, StringUtils.trimToEmpty(value));
|
|
|
|
+ headerTransferReverse.put(StringUtils.trimToEmpty(value), aliasField);
|
|
} else {
|
|
} else {
|
|
String undefined = "undefined" + i;
|
|
String undefined = "undefined" + i;
|
|
// 存入数据库的字段名
|
|
// 存入数据库的字段名
|
|
@@ -68,8 +68,8 @@ public class MongoExcelService {
|
|
aliasField = aliasField.replace("(", "(");
|
|
aliasField = aliasField.replace("(", "(");
|
|
aliasField = aliasField.replace(")", ")");
|
|
aliasField = aliasField.replace(")", ")");
|
|
headerDefined.put(aliasField, i);
|
|
headerDefined.put(aliasField, i);
|
|
- headerTransfer.put(aliasField, value);
|
|
|
|
- headerTransferReverse.put(value, aliasField);
|
|
|
|
|
|
+ headerTransfer.put(aliasField, StringUtils.trimToEmpty(value));
|
|
|
|
+ headerTransferReverse.put(StringUtils.trimToEmpty(value), aliasField);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Fields fields = new Fields();
|
|
Fields fields = new Fields();
|
|
@@ -85,7 +85,7 @@ public class MongoExcelService {
|
|
String field = entry.getKey();
|
|
String field = entry.getKey();
|
|
Integer index = entry.getValue();
|
|
Integer index = entry.getValue();
|
|
String value = index < valueList.size() ? valueList.get(index) : "";
|
|
String value = index < valueList.size() ? valueList.get(index) : "";
|
|
- data.put(field, value);
|
|
|
|
|
|
+ data.put(field, StringUtils.trimToEmpty(value));
|
|
}
|
|
}
|
|
dataList.add(data);
|
|
dataList.add(data);
|
|
if (dataList.size() == 1000) {
|
|
if (dataList.size() == 1000) {
|