|
@@ -617,6 +617,7 @@ public class TElQuController extends BaseController {
|
|
|
Workbook workbook = ExcelUtils.getWorkBook(file);
|
|
|
Sheet sheet = workbook.getSheetAt(0);
|
|
|
int rowNum = sheet.getPhysicalNumberOfRows();
|
|
|
+ logger.info("总行数:" + rowNum);
|
|
|
int failNumber = 0;
|
|
|
int successNumber = 0;
|
|
|
//报错行数统计
|
|
@@ -786,7 +787,7 @@ public class TElQuController extends BaseController {
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
failNumber++;
|
|
|
- logger.info("e:" + JSON.toJSONString(e));
|
|
|
+ logger.error("e:" + JSON.toJSONString(e));
|
|
|
failRow.add(i + 1);
|
|
|
}
|
|
|
}
|
|
@@ -797,7 +798,8 @@ public class TElQuController extends BaseController {
|
|
|
}
|
|
|
|
|
|
// 通用方法:替换 <sub> 和 <sup> 标签
|
|
|
- public static String replaceSubSup(String input) {
|
|
|
+ public String replaceSubSup(String input) {
|
|
|
+
|
|
|
// 映射用于将字符替换为对应的 Unicode 上标或下标
|
|
|
Map<Character, String> subMap = new HashMap<>();
|
|
|
Map<Character, String> supMap = new HashMap<>();
|
|
@@ -840,8 +842,10 @@ public class TElQuController extends BaseController {
|
|
|
supMap.put('9', "\u2079");
|
|
|
supMap.put('+', "\u207A");
|
|
|
supMap.put('-', "\u207B");
|
|
|
+
|
|
|
+ int iterationCount = 0;
|
|
|
// 替换 <sub> 标签
|
|
|
- while (input.contains("<sub>")) {
|
|
|
+ while (input.contains("<sub>")&& iterationCount < 500) {
|
|
|
int startIndex = input.indexOf("<sub>");
|
|
|
int endIndex = input.indexOf("</sub>");
|
|
|
|
|
@@ -860,11 +864,13 @@ public class TElQuController extends BaseController {
|
|
|
|
|
|
// 替换原来的 <sub> 标签为处理后的字符
|
|
|
input = input.substring(0, startIndex) + replacedSubContent + input.substring(endIndex + 6);
|
|
|
+ logger.info("处理结果:" + input);
|
|
|
}
|
|
|
+ iterationCount++;
|
|
|
}
|
|
|
|
|
|
// 替换 <sup> 或 <SUP> 标签
|
|
|
- while (input.contains("<SUP>") || input.contains("<sup>")) {
|
|
|
+ while (input.contains("<sup>") && iterationCount < 500) {
|
|
|
int startIndex = input.indexOf("<sup>") != -1 ? input.indexOf("<sup>") : input.indexOf("<SUP>");
|
|
|
int endIndex = input.indexOf("</sup>") != -1 ? input.indexOf("</sup>") : input.indexOf("</SUP>");
|
|
|
|
|
@@ -883,9 +889,11 @@ public class TElQuController extends BaseController {
|
|
|
|
|
|
// 替换原来的 <sup> 标签为处理后的字符
|
|
|
input = input.substring(0, startIndex) + replacedSupContent + input.substring(endIndex + 6);
|
|
|
+ logger.info("处理结果:" + input);
|
|
|
}
|
|
|
+ iterationCount++;
|
|
|
}
|
|
|
-
|
|
|
+ logger.info("处理结果:" + input);
|
|
|
return input;
|
|
|
}
|
|
|
}
|