Commit b1eb9a23 authored by wujipeng's avatar wujipeng
Browse files

优化项

parent 28afb558
......@@ -125,6 +125,13 @@ public class TheoreticalLibraryImportPreviewServiceImpl
}
}
for (TheoreticalLibraryImportQuestionVO question : preview.getNormalQuestions()) {
/*
* 有些题干包含化学式等说明性字母括号,例如“(B)……(Pb)”。
* 预览阶段可结合 A~E 选项唯一确定 B 才是答案,因此该题不会要求人工处理;
* 这里仍需把唯一答案位规范成旧导入器可识别的形式,避免正式入库时再次
* 按“最后一个全角括号”把 Pb 误读成 P。
*/
rewriteAutomaticallyResolvedAnswerBracket(sheet, question);
if (!"判断题".equals(question.getType()) && !question.getOptions().isEmpty()) {
// 正常题不会携带处理决定,因此在确认阶段统一标准化选项标记。
rewriteOptions(sheet, question, question.getOptions());
......@@ -293,16 +300,42 @@ public class TheoreticalLibraryImportPreviewServiceImpl
*/
private void rewriteAnswerBracket(
Sheet sheet, TheoreticalLibraryImportQuestionVO question, int selectedIndex) {
TheoreticalLibraryImportBracketVO selected = question.getAnswerCandidates().get(selectedIndex);
rewriteAnswerBracketAt(sheet, question, selected.getStartIndex());
}
/**
* 正常题不会提交人工决定;若选项能唯一排除化学式等说明性括号,则在确认文件中
* 自动保留该答案位为全角括号,其余括号转为半角,确保旧导入器读取到同一答案。
*/
private void rewriteAutomaticallyResolvedAnswerBracket(
Sheet sheet, TheoreticalLibraryImportQuestionVO question) {
if ("判断题".equals(question.getType())) {
return;
}
List<TheoreticalLibraryImportBracketVO> allCandidates =
findLetterBrackets(Objects.toString(question.getRawProblem(), ""));
if (allCandidates.size() < 2) {
return;
}
List<TheoreticalLibraryImportBracketVO> compatible =
compatibleAnswerCandidates(allCandidates, question.getOptions());
if (compatible.size() == 1) {
rewriteAnswerBracketAt(sheet, question, compatible.get(0).getStartIndex());
}
}
/** 按原题干字符坐标重写答案位,避免过滤候选后使用顺序下标选错括号。 */
private void rewriteAnswerBracketAt(
Sheet sheet, TheoreticalLibraryImportQuestionVO question, int selectedStartIndex) {
String raw = question.getRawProblem();
Matcher matcher = ANY_BRACKET.matcher(raw);
StringBuilder rewritten = new StringBuilder();
int cursor = 0;
int letterIndex = 0;
while (matcher.find()) {
rewritten.append(raw, cursor, matcher.start());
String content = matcher.group(1);
boolean letterCandidate = content.matches("[A-Za-z]+");
if (letterCandidate && letterIndex++ == selectedIndex) {
if (matcher.start() == selectedStartIndex) {
rewritten.append('(').append(content).append(')');
} else {
rewritten.append('(').append(content).append(')');
......@@ -494,12 +527,13 @@ public class TheoreticalLibraryImportPreviewServiceImpl
return result;
}
result.consumedOptionRow = true;
parseOptions(optionText, result);
parseOptions(type, rawProblem, optionText, result);
return result;
}
/** 将全角(A)~(E)标记切分为结构化选项,并检查跳号、重复及答案缺项。 */
private void parseOptions(String optionText, ParseResult result) {
private void parseOptions(
String type, String rawProblem, String optionText, ParseResult result) {
Matcher matcher = OPTION_MARKER.matcher(optionText);
List<OptionMarker> markers = new ArrayList<>();
while (matcher.find()) {
......@@ -547,6 +581,15 @@ public class TheoreticalLibraryImportPreviewServiceImpl
addIssue(result.issues, "OPTION_LABEL_DISCONTINUOUS",
"选项序号不连续,当前解析结果为 " + String.join("、", labels));
}
/*
* 旧规则会把最后一个全角括号当作答案。对于“(B)方法……含铅(Pb)废水”,
* 它会先得到错误答案 P。选项已经解析完成后,可以反向校验每个括号内容:
* B 能在 A~D 选项中找到,而 PB 中的 P 找不到,因此 B 是唯一可成立的答案位。
* 只有唯一候选满足条件时才自动纠正;若多个候选都合法,仍保留人工点选,避免猜测。
*/
resolveUniqueAnswerCandidate(type, rawProblem, result);
for (char answer : Objects.toString(result.validationAnswer, "")
.toUpperCase(Locale.ROOT).toCharArray()) {
// 不能只检查合法范围 A~E:P 等错误答案字母恰恰是需要在预览阶段暴露的异常。
......@@ -563,29 +606,85 @@ public class TheoreticalLibraryImportPreviewServiceImpl
return value >= 'A' && value <= 'Z';
}
/** 原型规则:题干至少两组括号且其中至少两组为纯英文字母时,必须人工选择答案位。 */
/**
* 收集题干中的纯英文字母括号。候选是否需要人工选择,要在选项解析完成后才能确定:
* 若只有一组候选的全部字母能映射到实际选项,则可安全自动识别;否则继续提示歧义。
*/
private void inspectAmbiguousBrackets(String rawProblem, ParseResult result) {
result.answerCandidates.addAll(findLetterBrackets(rawProblem));
if (result.answerCandidates.size() >= 2) {
addIssue(result.issues, "ANSWER_BRACKET_AMBIGUOUS",
"题干检测到 " + result.answerCandidates.size()
+ " 组英文字母括号,请点选一组作为标准答案位");
} else {
// 仅歧义题需要候选坐标;普通题不返回无意义的点选数据。
result.answerCandidates.clear();
}
}
/**
* 根据已解析的选项,自动确认唯一合理的答案括号。
*
* <p>候选内容中的每个字母都必须存在对应选项。例如选项为 A~D 时,B 合法,
* PB 因包含 P 而不合法。只有唯一合法候选时才修改答案和展示题干;两个候选都合法
* (例如题干同时含“(A)”和“(B)”)时仍交给管理员判断。</p>
*/
private void resolveUniqueAnswerCandidate(
String type, String rawProblem, ParseResult result) {
if (result.answerCandidates.size() < 2) {
return;
}
List<TheoreticalLibraryImportBracketVO> compatible = compatibleAnswerCandidates(
result.answerCandidates, result.options);
if (compatible.size() != 1) {
return;
}
TheoreticalLibraryImportBracketVO selected = compatible.get(0);
String selectedContent = selected.getContent();
result.validationAnswer = selectedContent;
result.answer = "单选题".equals(type)
? selectedContent.substring(0, 1) : selectedContent;
result.problem = rawProblem.substring(0, selected.getStartIndex())
+ "( )" + rawProblem.substring(selected.getEndIndex());
// 自动确认后不再向前端返回点选数据,也不再保留“括号歧义”异常。
result.answerCandidates.clear();
result.issues.removeIf(issue -> "ANSWER_BRACKET_AMBIGUOUS".equals(issue.getCode()));
}
/** 扫描纯英文字母括号,并保留精确字符坐标,供预览高亮和确认文件重写共同使用。 */
private List<TheoreticalLibraryImportBracketVO> findLetterBrackets(String rawProblem) {
List<TheoreticalLibraryImportBracketVO> result = new ArrayList<>();
Matcher matcher = LETTER_BRACKET.matcher(rawProblem);
int index = 0;
while (matcher.find()) {
TheoreticalLibraryImportBracketVO bracket = new TheoreticalLibraryImportBracketVO();
bracket.setIndex(index++);
bracket.setRawText(matcher.group(0));
// 候选答案对前端输出统一去除空格并转大写,便于与选项标签比对。
bracket.setContent(matcher.group(1).replaceAll("\\s+", "")
.toUpperCase(Locale.ROOT));
bracket.setStartIndex(matcher.start());
bracket.setEndIndex(matcher.end());
result.answerCandidates.add(bracket);
}
if (result.answerCandidates.size() >= 2) {
addIssue(result.issues, "ANSWER_BRACKET_AMBIGUOUS",
"题干检测到 " + result.answerCandidates.size()
+ " 组英文字母括号,请点选一组作为标准答案位");
} else {
// 仅歧义题需要候选坐标;普通题不返回无意义的点选数据。
result.answerCandidates.clear();
result.add(bracket);
}
return result;
}
/** 返回所有字母均能在当前选项标签中找到的答案候选。 */
private List<TheoreticalLibraryImportBracketVO> compatibleAnswerCandidates(
List<TheoreticalLibraryImportBracketVO> candidates,
List<TheoreticalLibraryImportOptionVO> options) {
String labels = options.stream()
.map(option -> Objects.toString(option.getLabel(), "")
.trim().toUpperCase(Locale.ROOT))
.collect(Collectors.joining());
return candidates.stream().filter(candidate -> {
String content = Objects.toString(candidate.getContent(), "")
.trim().toUpperCase(Locale.ROOT);
return !content.isEmpty() && content.chars().allMatch(value ->
isEnglishLetter((char) value) && labels.indexOf(value) >= 0);
}).collect(Collectors.toList());
}
/** 同时检查“当前文件内重复”和“相同范围、层级、题型的数据库重复”。 */
......
......@@ -121,7 +121,7 @@
| code | 含义 | 前端处理 |
|---|---|---|
| `ANSWER_BRACKET_AMBIGUOUS` | 题干至少两组纯英文字母括号 | 点选答案括号,提交 `answerCandidateIndex` |
| `ANSWER_BRACKET_AMBIGUOUS` | 题干至少两组纯英文字母括号,且结合现有选项后无法唯一确定答案位 | 点选答案括号,提交 `answerCandidateIndex` |
| `DUPLICATE_IN_FILE` | 与本文件前一题重复 | “跳过/仍然导入”,提交 `skip` |
| `OPTION_MISSING` | 题目下一行没有选项 | 编辑完整选项后提交 `options` |
| `OPTION_PARSE_ERROR` | 未识别出(A)~(E)标记 | 编辑完整选项后提交 `options` |
......
package com.platform.business.service.impl;
import com.platform.business.mapper.TheoreticalLibraryMapper;
import com.platform.business.model.dto.TheoreticalLibraryImportDecisionDTO;
import com.platform.business.model.entity.TheoreticalLibraryEntity;
import com.platform.business.model.vo.TheoreticalLibraryImportPreviewVO;
import com.platform.business.model.vo.TheoreticalLibraryImportQuestionVO;
......@@ -45,7 +44,7 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
}
@Test
void previewShouldKeepLegacySplitResultAndExposeAmbiguousAnswerBrackets() throws Exception {
void previewShouldIgnoreChemicalSymbolAndResolveUniqueAnswerBracket() throws Exception {
when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList());
MockMultipartFile file = workbook("污水三级理论题库.xlsx", sheet -> {
hierarchy(sheet, 4, 0, "基本要求");
......@@ -61,13 +60,15 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
assertEquals("污水三级", result.getScope());
assertEquals(1, result.getTotalCount());
assertEquals(1, result.getAbnormalCount());
TheoreticalLibraryImportQuestionVO question = result.getAbnormalQuestions().get(0);
// 旧导入按最后一个中文括号取首字母,因此默认仍为 P;预览通过候选位让管理员修正为 B。
assertEquals("P", question.getAnswer());
assertEquals(2, question.getAnswerCandidates().size());
assertEquals(0, result.getAbnormalCount());
TheoreticalLibraryImportQuestionVO question = result.getNormalQuestions().get(0);
// B 能映射到现有选项,PB 中的 P 无对应选项,因此可安全自动确定 B 为答案。
assertEquals("B", question.getAnswer());
assertEquals("以下( )方法常用于处理含铅(Pb)废水。", question.getProblem());
assertEquals(0, question.getAnswerCandidates().size());
assertTrue(question.getIssues().stream()
.anyMatch(issue -> "ANSWER_BRACKET_AMBIGUOUS".equals(issue.getCode())));
.noneMatch(issue -> "ANSWER_BRACKET_AMBIGUOUS".equals(issue.getCode())
|| "ANSWER_OPTION_MISSING".equals(issue.getCode())));
assertEquals(4, question.getOptions().size());
verify(theoreticalLibraryMapper).selectList(any());
}
......@@ -265,7 +266,8 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
}
@Test
void confirmPreparationShouldMakeSelectedAnswerVisibleToLegacySplitter() throws Exception {
void confirmPreparationShouldMakeAutomaticallyResolvedAnswerVisibleToLegacySplitter()
throws Exception {
when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList());
MockMultipartFile file = workbook("污水三级理论题库.xlsx", sheet -> {
hierarchy(sheet, 4, 0, "基本要求");
......@@ -276,16 +278,12 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
cell(sheet, 9, "以下(B)方法常用于处理含铅(Pb)废水。");
cell(sheet, 10, "(A)吸附 (B)沉淀 (C)过滤 (D)消毒");
});
TheoreticalLibraryImportDecisionDTO decision = new TheoreticalLibraryImportDecisionDTO();
decision.setSourceRow(10);
decision.setAnswerCandidateIndex(0);
org.springframework.web.multipart.MultipartFile transformed =
service.prepareConfirmedFile(file, Collections.singletonList(decision));
service.prepareConfirmedFile(file, Collections.emptyList());
try (Workbook workbook = WorkbookFactory.create(transformed.getInputStream())) {
String rewritten = workbook.getSheetAt(0).getRow(9).getCell(4).getStringCellValue();
assertEquals("以下(B)方法常用于处理含铅(Pb)废水。", rewritten);
// 处理后只剩答案位使用全角括号,旧 singleAnswer 的“最后括号”规则会稳定取得 B。
// 无需人工点选;处理后只剩答案位使用全角括号,旧拆题器会稳定取得 B。
int lastBracket = rewritten.lastIndexOf('(');
assertEquals("B", String.valueOf(rewritten.charAt(lastBracket + 1)));
}
......
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