Commit b224d61a authored by wujipeng's avatar wujipeng
Browse files

批量导入选项中混入了选项字母未识别,且识别出的多选答案不正确-优化

parent bffd50a7
......@@ -54,9 +54,18 @@ public class TheoreticalLibraryImportPreviewServiceImpl
Arrays.asList("判断题", "单选题", "多选题");
/** 同时匹配中英文括号,确保确认时使用的候选顺序与预览返回顺序完全一致。 */
private static final Pattern ANY_BRACKET = Pattern.compile("[((]([^()()]*)[))]");
private static final Pattern LETTER_BRACKET = Pattern.compile("[((]([A-Za-z]+)[))]");
private static final Pattern OPTION_MARKER = Pattern.compile("(([A-E]))");
private static final Pattern MULTIPLE_ANSWER = Pattern.compile("(([A-E]+))");
private static final Pattern LETTER_BRACKET =
Pattern.compile("[((]\\s*([A-Za-z](?:\\s*[A-Za-z])*)\\s*[))]");
/**
* 旧题库文件中选项标记并不完全统一:同一个单元格内可能同时出现
* 全角/半角括号、括号内空格及小写字母。这里统一兼容这些写法,避免
* {@code (B)} 或 {@code ( C )} 被并入前一个选项的内容。
*/
private static final Pattern OPTION_MARKER =
Pattern.compile("[((]\\s*([A-Ea-e])\\s*[))]");
/** 多选答案与选项标记采用同样的括号和大小写兼容规则。 */
private static final Pattern MULTIPLE_ANSWER =
Pattern.compile("[((]\\s*([A-Ea-e](?:\\s*[A-Ea-e])*)\\s*[))]");
@Resource
private TheoreticalLibraryMapper theoreticalLibraryMapper;
......@@ -106,6 +115,19 @@ public class TheoreticalLibraryImportPreviewServiceImpl
}
if (decision.getOptions() != null && !decision.getOptions().isEmpty()) {
rewriteOptions(sheet, question, decision.getOptions());
} else if (!"判断题".equals(question.getType())
&& !question.getOptions().isEmpty()) {
/*
* 即使管理员只处理了答案歧义,也要将已识别的混合格式选项
* 重写为旧入库器可读的标准全角标记,避免确认后又丢失选项。
*/
rewriteOptions(sheet, question, question.getOptions());
}
}
for (TheoreticalLibraryImportQuestionVO question : preview.getNormalQuestions()) {
if (!"判断题".equals(question.getType()) && !question.getOptions().isEmpty()) {
// 正常题不会携带处理决定,因此在确认阶段统一标准化选项标记。
rewriteOptions(sheet, question, question.getOptions());
}
}
workbook.write(output);
......@@ -440,10 +462,27 @@ public class TheoreticalLibraryImportPreviewServiceImpl
result.validationAnswer = legacySingleAnswerContent(rawProblem);
} else {
Matcher answerMatcher = MULTIPLE_ANSWER.matcher(rawProblem);
result.answer = answerMatcher.find() ? answerMatcher.group(1) : "";
int answerStart = -1;
int answerEnd = -1;
/*
* 答案通常放在题干末尾。旧逻辑使用第一个匹配,遇到
* “(A)工艺中……正确答案(AC)”会把 A 误当成多选答案。
* 遍历到最后一组合法括号,与项目已有单选题“取最后一组”规则保持一致。
*/
while (answerMatcher.find()) {
result.answer = answerMatcher.group(1).replaceAll("\\s+", "")
.toUpperCase(Locale.ROOT);
answerStart = answerMatcher.start();
answerEnd = answerMatcher.end();
}
result.validationAnswer = result.answer;
if (answerStart >= 0) {
// 只替换最终选中的答案括号,不破坏题干中其他相同括号。
result.problem = rawProblem.substring(0, answerStart)
+ "( )" + rawProblem.substring(answerEnd);
}
}
if (!isBlank(result.answer)) {
if (!isBlank(result.answer) && "单选题".equals(type)) {
result.problem = rawProblem.replace("(" + result.answer + ")", "( )");
}
inspectAmbiguousBrackets(rawProblem, result);
......@@ -464,7 +503,9 @@ public class TheoreticalLibraryImportPreviewServiceImpl
Matcher matcher = OPTION_MARKER.matcher(optionText);
List<OptionMarker> markers = new ArrayList<>();
while (matcher.find()) {
markers.add(new OptionMarker(matcher.group(1), matcher.start(), matcher.end()));
// 预览和后续校验统一使用大写标签,避免 a/A 被误判为不同选项。
markers.add(new OptionMarker(
matcher.group(1).toUpperCase(Locale.ROOT), matcher.start(), matcher.end()));
}
if (markers.isEmpty()) {
addIssue(result.issues, "OPTION_PARSE_ERROR", "未识别到(A)~(E)选项标记");
......@@ -516,7 +557,9 @@ public class TheoreticalLibraryImportPreviewServiceImpl
TheoreticalLibraryImportBracketVO bracket = new TheoreticalLibraryImportBracketVO();
bracket.setIndex(index++);
bracket.setRawText(matcher.group(0));
bracket.setContent(matcher.group(1));
// 候选答案对前端输出统一去除空格并转大写,便于与选项标签比对。
bracket.setContent(matcher.group(1).replaceAll("\\s+", "")
.toUpperCase(Locale.ROOT));
bracket.setStartIndex(matcher.start());
bracket.setEndIndex(matcher.end());
result.answerCandidates.add(bracket);
......
......@@ -47,6 +47,13 @@ import java.util.regex.Pattern;
*/
@Service
public class TheoreticalLibraryServiceImpl extends ServiceImpl<TheoreticalLibraryMapper, TheoreticalLibraryEntity> implements TheoreticalLibraryService {
/** 兼容旧文件中全角/半角括号、空格及小写字母混用的选项标记。 */
private static final Pattern LEGACY_OPTION_MARKER =
Pattern.compile("[((]\\s*([A-Ea-e])\\s*[))]");
/** 多选答案与预览服务使用同一套兼容规则。 */
private static final Pattern LEGACY_MULTIPLE_ANSWER = Pattern.compile(
"[((]\\s*([A-Ea-e](?:\\s*[A-Ea-e])*)\\s*[))]");
@javax.annotation.Resource
private TheoreticalLibraryNodeMapper theoreticalLibraryNodeMapper;
......@@ -200,7 +207,8 @@ public class TheoreticalLibraryServiceImpl extends ServiceImpl<TheoreticalLibrar
//拿到下一行内容并且跳过下一轮
String stringCellValue = getCellValueAsString(sheet.getRow(++i).getCell(4));
if (StringUtils.isNotEmpty(stringCellValue)) {
String replace = stringCellValue.replace("(A)", "").replace("(B)", "&&")
String replace = normalizeOptionMarkers(stringCellValue)
.replace("(A)", "").replace("(B)", "&&")
.replace("(C)", "&&").replace("(D)", "&&").replace(" ", "");
String[] split = replace.split("&&");
if (split.length == 4) {
......@@ -225,13 +233,14 @@ public class TheoreticalLibraryServiceImpl extends ServiceImpl<TheoreticalLibrar
//获取多选题答案
answer = multipleAnswer(column5);
if (StringUtils.isNotBlank(answer)) {
problem = column5.replaceAll("(" + answer + ")", "( )");
problem = replaceLastMultipleAnswer(column5);
if(ObjectUtils.isEmpty(sheet.getRow(i + 1))){
continue;
}
//拿到下一行内容并且跳过下一轮
String stringCellValue = getCellValueAsString(sheet.getRow(++i).getCell(4));
String replace = stringCellValue.replace("(A)", "").replace("(B)", "&&")
String replace = normalizeOptionMarkers(stringCellValue)
.replace("(A)", "").replace("(B)", "&&")
.replace("(C)", "&&").replace("(D)", "&&").replace("(E)", "&&").replace(" ", "");
String[] split = replace.split("&&");
if (split.length == 5) {
......@@ -414,7 +423,8 @@ public class TheoreticalLibraryServiceImpl extends ServiceImpl<TheoreticalLibrar
String stringCellValue = getCellValueAsString(sheet.getRow(++i).getCell(4));
System.out.println("单选题答案--------------" + stringCellValue);
if (StringUtils.isNotEmpty(stringCellValue)) {
String replace = stringCellValue.replace("(A)", "").replace("(B)", "&&")
String replace = normalizeOptionMarkers(stringCellValue)
.replace("(A)", "").replace("(B)", "&&")
.replace("(C)", "&&").replace("(D)", "&&").replace(" ", "");
String[] split = replace.split("&&");
if (split.length == 4) {
......@@ -439,11 +449,12 @@ public class TheoreticalLibraryServiceImpl extends ServiceImpl<TheoreticalLibrar
//获取多选题答案
answer = multipleAnswer(column5);
if (StringUtils.isNotBlank(answer)) {
problem = column5.replaceAll("(" + answer + ")", "( )");
problem = replaceLastMultipleAnswer(column5);
//拿到下一行内容并且跳过下一轮
String stringCellValue = getCellValueAsString(sheet.getRow(++i).getCell(4));
System.out.println("多选题答案--------------" + stringCellValue);
String replace = stringCellValue.replace("(A)", "").replace("(B)", "&&")
String replace = normalizeOptionMarkers(stringCellValue)
.replace("(A)", "").replace("(B)", "&&")
.replace("(C)", "&&").replace("(D)", "&&").replace("(E)", "&&").replace(" ", "");
String[] split = replace.split("&&");
if (split.length == 5) {
......@@ -846,15 +857,55 @@ public class TheoreticalLibraryServiceImpl extends ServiceImpl<TheoreticalLibrar
}
private String multipleAnswer(String column5) {
// 定义正则表达式匹配中文括号内的A-E字母组合
Pattern pattern = Pattern.compile("(([A-E]+))");
Matcher matcher = pattern.matcher(column5);
/*
* 旧 Excel 数据可能混用全角/半角括号、括号内空格和小写答案字母,
* 因此正式入库与预览必须使用相同的兼容规则,否则会出现“预览正常、入库答案为空”。
*/
Matcher matcher = LEGACY_MULTIPLE_ANSWER.matcher(column5);
if (matcher.find()) {
return matcher.group(1);
} else {
return "";
String answer = "";
/*
* 题干中可能在标准答案前出现(A)之类的说明性括号。
* 标准答案按模板放在题干末尾,所以取最后一组匹配,避免误取前面的单个字母。
*/
while (matcher.find()) {
answer = matcher.group(1).replaceAll("\\s+", "").toUpperCase(Locale.ROOT);
}
return answer;
}
/**
* 只将题干中最后一组合法多选答案替换为空白位。
*
* <p>不使用全局 {@code replaceAll},是为了保留题干前文可能出现的
* {@code (A)}说明,并同时支持半角括号和括号内空格。</p>
*/
private String replaceLastMultipleAnswer(String problem) {
Matcher matcher = LEGACY_MULTIPLE_ANSWER.matcher(problem);
int start = -1;
int end = -1;
while (matcher.find()) {
start = matcher.start();
end = matcher.end();
}
return start < 0 ? problem
: problem.substring(0, start) + "( )" + problem.substring(end);
}
/**
* 将可识别的选项标记统一成旧切分逻辑期望的全角大写格式。
*
* <p>仅改写 A~E 的单字母括号,不会改动选项内容里的数值、单位或普通括号。</p>
*/
private String normalizeOptionMarkers(String optionText) {
Matcher matcher = LEGACY_OPTION_MARKER.matcher(optionText);
StringBuffer normalized = new StringBuffer();
while (matcher.find()) {
String label = matcher.group(1).toUpperCase(Locale.ROOT);
matcher.appendReplacement(normalized, Matcher.quoteReplacement("(" + label + ")"));
}
matcher.appendTail(normalized);
return normalized.toString();
}
@Override
......
......@@ -95,6 +95,56 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
.noneMatch(issue -> "ANSWER_OPTION_MISSING".equals(issue.getCode())));
}
@Test
void previewShouldRecognizeMixedOptionMarkersWithoutLeakingLettersIntoContent() throws Exception {
when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList());
MockMultipartFile file = workbook("污泥四级题库.xlsx", sheet -> {
hierarchy(sheet, 4, 0, "第一章");
hierarchy(sheet, 5, 1, "第一节");
hierarchy(sheet, 6, 2, "第一目");
hierarchy(sheet, 7, 3, "知识点");
cell(sheet, 8, "多选题");
cell(sheet, 9, "可能导致污泥膨胀的工艺条件有(AC)。");
// 复现实际文件中全角、半角、空格及小写标记混用的情况。
cell(sheet, 10, "(A)低DO (B) 高SRT ( C )高F/M (d)营养物不足");
});
TheoreticalLibraryImportPreviewVO result = service.preview(file);
assertEquals(0, result.getAbnormalCount());
TheoreticalLibraryImportQuestionVO question = result.getNormalQuestions().get(0);
assertEquals("AC", question.getAnswer());
assertEquals(4, question.getOptions().size());
assertEquals("ABCD", question.getOptions().stream()
.map(option -> option.getLabel()).collect(java.util.stream.Collectors.joining()));
// B/C/D 标记必须被消耗为分隔符,不得混入前一个选项内容。
assertTrue(question.getOptions().stream().noneMatch(option ->
option.getContent().contains("(B)")
|| option.getContent().contains("( C )")
|| option.getContent().contains("(d)")));
}
@Test
void previewShouldUseLastValidBracketAsMultipleChoiceAnswer() throws Exception {
when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList());
MockMultipartFile file = workbook("污泥四级题库.xlsx", sheet -> {
hierarchy(sheet, 4, 0, "第一章");
hierarchy(sheet, 5, 1, "第一节");
hierarchy(sheet, 6, 2, "第一目");
hierarchy(sheet, 7, 3, "知识点");
cell(sheet, 8, "多选题");
cell(sheet, 9, "(A)工艺中,可能导致污泥膨胀的条件有 (a c)");
cell(sheet, 10, "(A)低DO (B)高SRT (C)高F/M (D)营养物不足");
});
TheoreticalLibraryImportQuestionVO question =
service.preview(file).getAbnormalQuestions().get(0);
// 题干含两组字母括号会保留人工确认异常,但默认答案必须是末尾的 AC。
assertEquals("AC", question.getAnswer());
assertEquals("(A)工艺中,可能导致污泥膨胀的条件有 ( )", question.getProblem());
}
@Test
void previewShouldReportAnswerLetterOutsideSupportedOptionRange() throws Exception {
when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList());
......
......@@ -48,6 +48,20 @@ class TheoreticalLibraryServiceImplTest {
ReflectionTestUtils.setField(service, "theoreticalLibraryNodeMapper", nodeMapper);
}
@Test
void legacyParserShouldNormalizeMixedMarkersAndUseLastMultipleAnswer() {
String optionText = ReflectionTestUtils.invokeMethod(
service, "normalizeOptionMarkers", "(A)甲 (b)乙 ( C )丙 (D)丁");
String answer = ReflectionTestUtils.invokeMethod(
service, "multipleAnswer", "(A)工艺中正确条件为 (a c)");
String problem = ReflectionTestUtils.invokeMethod(
service, "replaceLastMultipleAnswer", "(A)工艺中正确条件为 (a c)");
assertEquals("(A)甲 (B)乙 (C)丙 (D)丁", optionText);
assertEquals("AC", answer);
assertEquals("(A)工艺中正确条件为 ( )", problem);
}
@Test
void legacyImportShouldKeepEmptyBranchAndCompleteQuestionPath() {
TheoreticalLibraryEntity emptySection = row("structure", false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment