Commit 12e76975 authored by wujipeng's avatar wujipeng
Browse files

试题导入-选项标识-优化

parent 1575edd3
...@@ -161,7 +161,8 @@ public class TheoreticalLibraryImportPreviewServiceImpl ...@@ -161,7 +161,8 @@ public class TheoreticalLibraryImportPreviewServiceImpl
+ " 行需选择有效的答案括号"); + " 行需选择有效的答案括号");
} }
} }
if (hasOptionIssue(question)) { if (hasOptionIssue(question)
&& !selectedAnswerResolvesMissingOption(question, decision)) {
validateEditedOptions(question, decision.getOptions()); validateEditedOptions(question, decision.getOptions());
} }
} }
...@@ -177,6 +178,41 @@ public class TheoreticalLibraryImportPreviewServiceImpl ...@@ -177,6 +178,41 @@ public class TheoreticalLibraryImportPreviewServiceImpl
|| "ANSWER_OPTION_MISSING".equals(issue.getCode())); || "ANSWER_OPTION_MISSING".equals(issue.getCode()));
} }
/**
* 判断管理员点选答案括号后,是否已经单独解决了“答案无对应选项”异常。
*
* <p>例如“(B)方法……(Pb)废水”会被旧拆题器误取 P,但管理员选择第一组括号后,
* 答案 B 已被原选项覆盖,此时不应再强制编辑选项。若还存在跳号、重复等真正的选项异常,
* 或像截图中的 P 一样没有可点选的正确答案,则仍必须修正选项或跳过该题。</p>
*/
private boolean selectedAnswerResolvesMissingOption(
TheoreticalLibraryImportQuestionVO question,
TheoreticalLibraryImportDecisionDTO decision) {
if (!hasIssue(question, "ANSWER_OPTION_MISSING")
|| decision.getAnswerCandidateIndex() == null) {
return false;
}
boolean hasOtherOptionIssue = question.getIssues().stream().anyMatch(issue ->
issue.getCode().startsWith("OPTION_"));
if (hasOtherOptionIssue) {
return false;
}
TheoreticalLibraryImportBracketVO selected = question.getAnswerCandidates()
.get(decision.getAnswerCandidateIndex());
String selectedAnswer = Objects.toString(selected.getContent(), "")
.trim().toUpperCase(Locale.ROOT);
if (isBlank(selectedAnswer)) {
return false;
}
String labels = question.getOptions().stream()
.map(option -> Objects.toString(option.getLabel(), "")
.trim().toUpperCase(Locale.ROOT))
.collect(Collectors.joining());
return selectedAnswer.chars().allMatch(value ->
isEnglishLetter((char) value) && labels.indexOf(value) >= 0);
}
/** 修正后的选项仍需满足连续、唯一且覆盖答案,防止“已处理”数据再次被旧拆题器错误切分。 */ /** 修正后的选项仍需满足连续、唯一且覆盖答案,防止“已处理”数据再次被旧拆题器错误切分。 */
private void validateEditedOptions( private void validateEditedOptions(
TheoreticalLibraryImportQuestionVO question, TheoreticalLibraryImportQuestionVO question,
...@@ -196,8 +232,11 @@ public class TheoreticalLibraryImportPreviewServiceImpl ...@@ -196,8 +232,11 @@ public class TheoreticalLibraryImportPreviewServiceImpl
if (options.stream().anyMatch(option -> isBlank(option.getContent()))) { if (options.stream().anyMatch(option -> isBlank(option.getContent()))) {
throw new BusinessException("第 " + question.getSourceRow() + " 行选项内容不能为空"); throw new BusinessException("第 " + question.getSourceRow() + " 行选项内容不能为空");
} }
for (char answer : Objects.toString(question.getAnswer(), "").toCharArray()) { for (char answer : Objects.toString(question.getAnswer(), "")
if (answer >= 'A' && answer <= 'E' && actual.indexOf(answer) < 0) { .toUpperCase(Locale.ROOT).toCharArray()) {
// 答案解析沿用旧导入逻辑,可能得到 A~E 之外的错误字母(如 P)。
// 此处必须校验全部英文字母,否则管理员即使没有真正修正答案,也能让异常题通过确认。
if (isEnglishLetter(answer) && actual.indexOf(answer) < 0) {
throw new BusinessException("第 " + question.getSourceRow() throw new BusinessException("第 " + question.getSourceRow()
+ " 行答案字母 " + answer + " 没有对应选项"); + " 行答案字母 " + answer + " 没有对应选项");
} }
...@@ -433,15 +472,22 @@ public class TheoreticalLibraryImportPreviewServiceImpl ...@@ -433,15 +472,22 @@ public class TheoreticalLibraryImportPreviewServiceImpl
addIssue(result.issues, "OPTION_LABEL_DISCONTINUOUS", addIssue(result.issues, "OPTION_LABEL_DISCONTINUOUS",
"选项序号不连续,当前解析结果为 " + String.join("、", labels)); "选项序号不连续,当前解析结果为 " + String.join("、", labels));
} }
for (char answer : Objects.toString(result.answer, "").toCharArray()) { for (char answer : Objects.toString(result.answer, "")
if (answer >= 'A' && answer <= 'E' .toUpperCase(Locale.ROOT).toCharArray()) {
&& !labels.contains(String.valueOf(answer))) { // 不能只检查合法范围 A~E:P 等错误答案字母恰恰是需要在预览阶段暴露的异常。
// 非字母字符交由原有答案解析规则处理,避免把空格、符号误报为“缺少选项”。
if (isEnglishLetter(answer) && !labels.contains(String.valueOf(answer))) {
addIssue(result.issues, "ANSWER_OPTION_MISSING", addIssue(result.issues, "ANSWER_OPTION_MISSING",
"答案字母 " + answer + " 没有对应选项"); "答案字母 " + answer + " 没有对应选项");
} }
} }
} }
/** 判断字符是否为英文答案字母;调用方会先统一转成大写。 */
private boolean isEnglishLetter(char value) {
return value >= 'A' && value <= 'Z';
}
/** 原型规则:题干至少两组括号且其中至少两组为纯英文字母时,必须人工选择答案位。 */ /** 原型规则:题干至少两组括号且其中至少两组为纯英文字母时,必须人工选择答案位。 */
private void inspectAmbiguousBrackets(String rawProblem, ParseResult result) { private void inspectAmbiguousBrackets(String rawProblem, ParseResult result) {
Matcher matcher = LETTER_BRACKET.matcher(rawProblem); Matcher matcher = LETTER_BRACKET.matcher(rawProblem);
......
...@@ -95,6 +95,31 @@ class TheoreticalLibraryImportPreviewServiceImplTest { ...@@ -95,6 +95,31 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
.noneMatch(issue -> "ANSWER_OPTION_MISSING".equals(issue.getCode()))); .noneMatch(issue -> "ANSWER_OPTION_MISSING".equals(issue.getCode())));
} }
@Test
void previewShouldReportAnswerLetterOutsideSupportedOptionRange() 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, "单选题");
// 复现线上文件:旧拆题规则会把 P 解析为答案,但选项实际只有 A~D。
cell(sheet, 9, "在处理城镇污泥时,(P)最符合职业道德。");
cell(sheet, 10, "(A)节省时间 (B)规范处理 (C)逃避责任 (D)随意倾倒");
});
TheoreticalLibraryImportPreviewVO result = service.preview(file);
assertEquals(1, result.getAbnormalCount());
assertEquals(0, result.getNormalCount());
TheoreticalLibraryImportQuestionVO question = result.getAbnormalQuestions().get(0);
assertEquals("P", question.getAnswer());
assertTrue(question.getIssues().stream().anyMatch(issue ->
"ANSWER_OPTION_MISSING".equals(issue.getCode())
&& issue.getMessage().contains("P")));
}
@Test @Test
void previewShouldRejectFilenameThatOriginalImporterCannotRoute() throws Exception { void previewShouldRejectFilenameThatOriginalImporterCannotRoute() throws Exception {
MockMultipartFile file = workbook("理论题库.xlsx", sheet -> cell(sheet, 4, "判断题")); MockMultipartFile file = workbook("理论题库.xlsx", sheet -> cell(sheet, 4, "判断题"));
......
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