ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 导入支持UTF8编码导入

Browse Source
This commit is contained in:
mzaxd
2023-11-09 14:42:33 +08:00
parent 40221b91ae
commit e2aae12414
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class ImportUtil {
try { try {
standardNumber = cell.toString().trim(); standardNumber = cell.toString().trim();
// 必须是数字 // 必须是数字
if (!standardNumber.matches("^[0-9]*$")) { if (!standardNumber.matches("^[0-9]+(\\.[0-9]+)?$")) {
log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误，标准号必须为数字 "); log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误，标准号必须为数字 ");
errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误，标准号必须为数字 "); errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误，标准号必须为数字 ");
break; break;
laws-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+6 -1
View File
@@ -31,7 +31,12 @@ public class FileUnZip {
if (!pathFile.exists()) { if (!pathFile.exists()) {
pathFile.mkdirs(); pathFile.mkdirs();
} }
ZipFile zip = new ZipFile(zipFile,"gbk"); ZipFile zip = null;
try {
zip = new ZipFile(zipFile,"gbk");
} catch (Exception e) {
zip = new ZipFile(zipFile,"utf-8");
}
String orgMkdirs = ""; String orgMkdirs = "";
int count = 0; int count = 0;
for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) { for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) {