"...platform/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "dd19649862f148c18eb5c07464db5a087e8a1964"
Commit 97d0574e authored by wujipeng's avatar wujipeng
Browse files

优化项

parent b1eb9a23
...@@ -32,7 +32,9 @@ import org.apache.poi.xwpf.usermodel.XWPFTableRow; ...@@ -32,7 +32,9 @@ import org.apache.poi.xwpf.usermodel.XWPFTableRow;
import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVMerge;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVerticalJc; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVerticalJc;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc; import org.openxmlformats.schemas.wordprocessingml.x2006.main.STVerticalJc;
import org.apache.xmlbeans.XmlException; import org.apache.xmlbeans.XmlException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -108,9 +110,13 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -108,9 +110,13 @@ public class CourseAdminServiceImpl implements CourseAdminService {
private static final Pattern IMPORT_TIME_PATTERN = Pattern.compile( private static final Pattern IMPORT_TIME_PATTERN = Pattern.compile(
"(\\d{1,2}:\\d{2})\\s*[~~—–-]\\s*(\\d{1,2}:\\d{2})"); "(\\d{1,2}:\\d{2})\\s*[~~—–-]\\s*(\\d{1,2}:\\d{2})");
/** 分班实训备注示例:上午:1班,下午:2班。 */ /**
* 分班或分批实训备注示例:上午:1班,下午:2班;上午:第一批,下午:第二批。
* “第”字仅是批次的自然语言前缀,不参与后续数字转换。
*/
private static final Pattern IMPORT_SHIFT_PATTERN = Pattern.compile( private static final Pattern IMPORT_SHIFT_PATTERN = Pattern.compile(
"上午\\s*[::]\\s*([一二三四五六七八九十0-9]+)班.*?下午\\s*[::]\\s*([一二三四五六七八九十0-9]+)班"); "上午\\s*[::]\\s*(?:第\\s*)?([一二三四五六七八九十0-9]+)\\s*(?:班|批)"
+ ".*?下午\\s*[::]\\s*(?:第\\s*)?([一二三四五六七八九十0-9]+)\\s*(?:班|批)");
/** 班级名称中的班号用于选择分班实训的上午或下午时段。 */ /** 班级名称中的班号用于选择分班实训的上午或下午时段。 */
private static final Pattern CLASS_NUMBER_PATTERN = Pattern.compile( private static final Pattern CLASS_NUMBER_PATTERN = Pattern.compile(
...@@ -293,12 +299,15 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -293,12 +299,15 @@ public class CourseAdminServiceImpl implements CourseAdminService {
} }
int importYear = resolveImportYear(managedClass); int importYear = resolveImportYear(managedClass);
Integer targetClassNumber = extractClassNumber(managedClass.getName()); Integer targetClassNumber = resolveImportClassNumber(document, managedClass);
Map<String, List<ClassAdminOptionVO>> teachersByName = options().getTeachers().stream() Map<String, List<ClassAdminOptionVO>> teachersByName = options().getTeachers().stream()
.filter(option -> trimToNull(option.getLabel()) != null) .filter(option -> trimToNull(option.getLabel()) != null)
.collect(Collectors.groupingBy(option -> option.getLabel().trim())); .collect(Collectors.groupingBy(option -> option.getLabel().trim()));
ParsedImport result = new ParsedImport(); ParsedImport result = new ParsedImport();
// Word 纵向合并的续行只保存 <w:vMerge/>,单元格本身没有可见文本。
// 按列记录合并起始行的原始值,使续行能够获得 Word 界面中视觉上继承的内容。
Map<Integer, String> verticalMergeValues = new HashMap<>();
for (int rowIndex = headerRowIndex + 1; for (int rowIndex = headerRowIndex + 1;
rowIndex < courseTable.getRows().size(); rowIndex++) { rowIndex < courseTable.getRows().size(); rowIndex++) {
XWPFTableRow row = courseTable.getRow(rowIndex); XWPFTableRow row = courseTable.getRow(rowIndex);
...@@ -306,7 +315,8 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -306,7 +315,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
continue; continue;
} }
String subject = normalizeCellText(cellText(row, 4)); String[] rowValues = resolveImportRowValues(row, verticalMergeValues);
String subject = normalizeCellText(rowValues[4]);
if (subject.isEmpty()) { if (subject.isEmpty()) {
continue; continue;
} }
...@@ -318,7 +328,7 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -318,7 +328,7 @@ public class CourseAdminServiceImpl implements CourseAdminService {
try { try {
CourseAdminSaveDTO course = parseImportRow( CourseAdminSaveDTO course = parseImportRow(
row, subject, importYear, targetClassNumber, teachersByName); rowValues, subject, importYear, targetClassNumber, teachersByName);
result.courses.add(course); result.courses.add(course);
} catch (BusinessException e) { } catch (BusinessException e) {
throw new BusinessException("课程安排表第" + (rowIndex + 1) + "行:" + e.getMessage()); throw new BusinessException("课程安排表第" + (rowIndex + 1) + "行:" + e.getMessage());
...@@ -329,26 +339,27 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -329,26 +339,27 @@ public class CourseAdminServiceImpl implements CourseAdminService {
/** 将一行Word表格转换为课程保存对象,并处理上午/下午分班实训。 */ /** 将一行Word表格转换为课程保存对象,并处理上午/下午分班实训。 */
private CourseAdminSaveDTO parseImportRow( private CourseAdminSaveDTO parseImportRow(
XWPFTableRow row, String originalSubject, int importYear, String[] rowValues, String originalSubject, int importYear,
Integer targetClassNumber, Map<String, List<ClassAdminOptionVO>> teachersByName) { Integer targetClassNumber, Map<String, List<ClassAdminOptionVO>> teachersByName) {
CourseAdminSaveDTO course = new CourseAdminSaveDTO(); CourseAdminSaveDTO course = new CourseAdminSaveDTO();
course.setDate(parseImportDate(cellText(row, 0), importYear)); course.setDate(parseImportDate(rowValues[0], importYear));
Integer subjectTimes = parseImportInteger(cellText(row, 1), "课次"); Integer subjectTimes = parseImportInteger(rowValues[1], "课次");
BigDecimal subjectHours = parseImportDecimal(cellText(row, 3), "课时"); BigDecimal subjectHours = parseImportDecimal(rowValues[3], "课时");
List<String> allFrames = parseImportTimeFrames(cellText(row, 2)); List<String> allFrames = parseImportTimeFrames(rowValues[2]);
Matcher shiftMatcher = IMPORT_SHIFT_PATTERN.matcher(originalSubject); Matcher shiftMatcher = IMPORT_SHIFT_PATTERN.matcher(originalSubject);
if (shiftMatcher.find()) { if (shiftMatcher.find()) {
if (targetClassNumber == null) { if (targetClassNumber == null) {
throw new BusinessException("分班实训无法识别目标班号,请在班级名称中保留“1班”等班号"); throw new BusinessException("分班或分批实训无法识别目标班号,请在班级名称中保留“1班”等班号");
} }
int morningClass = parseChineseNumber(shiftMatcher.group(1)); int morningClass = parseChineseNumber(shiftMatcher.group(1));
int afternoonClass = parseChineseNumber(shiftMatcher.group(2)); int afternoonClass = parseChineseNumber(shiftMatcher.group(2));
boolean selectMorning = targetClassNumber == morningClass; boolean selectMorning = targetClassNumber == morningClass;
boolean selectAfternoon = targetClassNumber == afternoonClass; boolean selectAfternoon = targetClassNumber == afternoonClass;
if (!selectMorning && !selectAfternoon) { if (!selectMorning && !selectAfternoon) {
throw new BusinessException("分班实训备注中未包含目标班级“" + targetClassNumber + "班”"); throw new BusinessException("分班或分批实训备注中未包含目标班级对应的第"
+ targetClassNumber + "组");
} }
List<String> selectedFrames = allFrames.stream().filter(frame -> { List<String> selectedFrames = allFrames.stream().filter(frame -> {
...@@ -382,6 +393,8 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -382,6 +393,8 @@ public class CourseAdminServiceImpl implements CourseAdminService {
allFrames = selectedFrames; allFrames = selectedFrames;
originalSubject = (originalSubject.substring(0, shiftMatcher.start()) originalSubject = (originalSubject.substring(0, shiftMatcher.start())
+ originalSubject.substring(shiftMatcher.end())) + originalSubject.substring(shiftMatcher.end()))
// 分组说明通常被一对独立括号包裹;移除说明后同步清理遗留的空括号。
.replaceAll("[((]\\s*[))]\\s*$", "")
.replaceAll("[((\\s]+$", "").trim(); .replaceAll("[((\\s]+$", "").trim();
} }
...@@ -391,7 +404,7 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -391,7 +404,7 @@ public class CourseAdminServiceImpl implements CourseAdminService {
course.setSubjectName(originalSubject); course.setSubjectName(originalSubject);
course.setType(resolveImportCourseType(originalSubject)); course.setType(resolveImportCourseType(originalSubject));
String teacherName = normalizeCellText(cellText(row, 5)); String teacherName = normalizeCellText(rowValues[5]);
List<ClassAdminOptionVO> matchedTeachers = teachersByName.get(teacherName); List<ClassAdminOptionVO> matchedTeachers = teachersByName.get(teacherName);
if (matchedTeachers == null || matchedTeachers.isEmpty()) { if (matchedTeachers == null || matchedTeachers.isEmpty()) {
throw new BusinessException("未找到授课教师“" + teacherName + "”的有效系统账户"); throw new BusinessException("未找到授课教师“" + teacherName + "”的有效系统账户");
...@@ -490,6 +503,33 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -490,6 +503,33 @@ public class CourseAdminServiceImpl implements CourseAdminService {
return matcher.find() ? parseChineseNumber(matcher.group(1)) : null; return matcher.find() ? parseChineseNumber(matcher.group(1)) : null;
} }
/**
* 确定分班或分批课程对应的目标班号。
*
* <p>系统班级名称是当前导入目标,存在班号时始终优先使用,避免上传文件标题与实际
* 目标班级不一致时导错时段。部分历史班级在系统中只保存“2026年第1期”等名称,
* 没有“1班”字样;此时再从 Word 顶部的“班级:……1班”说明段落中提取班号。</p>
*/
private Integer resolveImportClassNumber(XWPFDocument document, ClassEntity managedClass) {
Integer managedClassNumber = extractClassNumber(managedClass.getName());
if (managedClassNumber != null) {
return managedClassNumber;
}
for (XWPFParagraph paragraph : document.getParagraphs()) {
String paragraphText = normalizeCellText(paragraph.getText());
String compactText = paragraphText.replaceAll("\\s+", "");
if (!compactText.contains("班级:") && !compactText.contains("班级:")) {
continue;
}
Integer documentClassNumber = extractClassNumber(paragraphText);
if (documentClassNumber != null) {
return documentClassNumber;
}
}
return null;
}
/** 模板目前主要使用1班/2班,同时兼容一至十九的中文班号。 */ /** 模板目前主要使用1班/2班,同时兼容一至十九的中文班号。 */
private int parseChineseNumber(String value) { private int parseChineseNumber(String value) {
if (value.matches("\\d+")) { if (value.matches("\\d+")) {
...@@ -508,8 +548,44 @@ public class CourseAdminServiceImpl implements CourseAdminService { ...@@ -508,8 +548,44 @@ public class CourseAdminServiceImpl implements CourseAdminService {
throw new BusinessException("班号“" + value + "”无法识别"); throw new BusinessException("班号“" + value + "”无法识别");
} }
private String cellText(XWPFTableRow row, int index) { /**
return index < row.getTableCells().size() ? row.getCell(index).getText() : ""; * 读取导入行的有效文本,并还原 Word 纵向合并续行在界面中显示、但底层 XML 未重复保存的值。
*
* <p>只对存在 {@code w:vMerge} 标记的单元格执行继承。普通空单元格不会沿用上一行,
* 因而原有的必填校验仍然有效,不会掩盖用户实际漏填的数据。</p>
*/
private String[] resolveImportRowValues(
XWPFTableRow row, Map<Integer, String> verticalMergeValues) {
int columnCount = Math.max(7, row.getTableCells().size());
String[] values = new String[columnCount];
for (int columnIndex = 0; columnIndex < columnCount; columnIndex++) {
if (columnIndex >= row.getTableCells().size()) {
values[columnIndex] = "";
verticalMergeValues.remove(columnIndex);
continue;
}
XWPFTableCell cell = row.getCell(columnIndex);
String currentValue = cell.getText();
CTTcPr cellProperties = cell.getCTTc().getTcPr();
CTVMerge verticalMerge = cellProperties == null || !cellProperties.isSetVMerge()
? null : cellProperties.getVMerge();
if (verticalMerge == null) {
// 非合并单元格会终止该列之前的合并区域,防止值泄漏到后续普通行。
verticalMergeValues.remove(columnIndex);
values[columnIndex] = currentValue;
} else if (verticalMerge.isSetVal()
&& STMerge.RESTART.equals(verticalMerge.getVal())) {
// restart 是合并区域首行,应以当前单元格文本刷新该列的继承值。
verticalMergeValues.put(columnIndex, currentValue);
values[columnIndex] = currentValue;
} else {
// Word 通常用省略 val 的 <w:vMerge/> 表示 continue,也兼容显式 continue。
values[columnIndex] = verticalMergeValues.getOrDefault(columnIndex, currentValue);
}
}
return values;
} }
private String normalizeCellText(String value) { private String normalizeCellText(String value) {
......
...@@ -481,7 +481,11 @@ public class TheoreticalLibraryImportPreviewServiceImpl ...@@ -481,7 +481,11 @@ public class TheoreticalLibraryImportPreviewServiceImpl
if ("判断题".equals(type)) { if ("判断题".equals(type)) {
result.answer = rawProblem.contains("√") ? "√" : "×"; result.answer = rawProblem.contains("√") ? "√" : "×";
result.problem = rawProblem.replace("(" + result.answer + ")", ""); result.problem = rawProblem.replace("(" + result.answer + ")", "");
inspectAmbiguousBrackets(rawProblem, result); /*
* 判断题的答案只可能是题尾的“√/×”,题干中的英文字母括号属于正文,
* 例如“雌激素当量(EEQ)……化学需氧量(COD)……(×)”。
* 因此判断题不能进入选择题的答案括号歧义检测,否则会把指标缩写误当成选项。
*/
return result; return result;
} }
......
...@@ -25,6 +25,9 @@ import org.mockito.junit.jupiter.MockitoExtension; ...@@ -25,6 +25,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.poi.xwpf.usermodel.XWPFTable; import org.apache.poi.xwpf.usermodel.XWPFTable;
import org.apache.poi.xwpf.usermodel.XWPFTableRow; import org.apache.poi.xwpf.usermodel.XWPFTableRow;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTVMerge;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
...@@ -659,6 +662,56 @@ class CourseAdminServiceImplTest { ...@@ -659,6 +662,56 @@ class CourseAdminServiceImplTest {
} }
} }
@Test
void parseImportShouldUseDocumentClassNumberForMergedBatchRows() throws Exception {
when(classSubjectMapper.selectAdminCourseTeacherOptions()).thenReturn(Arrays.asList(
new ClassAdminOptionVO("teacher-1", "张老师", null, null),
new ClassAdminOptionVO("teacher-2", "李老师", null, null)));
ClassEntity managedClass = new ClassEntity();
// 模拟平台中的历史班级名称:只有期数,没有可供分批课程使用的“1班”字样。
managedClass.setName("污泥处理工三级2026年第1期");
managedClass.setTrainingYear(2026);
try (XWPFDocument document = new XWPFDocument()) {
// 附件标题区域仍保留了准确班号,解析器应在系统名称缺失班号时使用该后备值。
document.createParagraph().createRun()
.setText("班级:污泥处理工(三级)2026年1班 总课时:240课时");
XWPFTable table = document.createTable(3, 7);
setImportRow(table.getRow(0), "日期", "课次", "时段", "课时", "课 程", "授课教师", "序号");
setImportRow(table.getRow(1), "12/07 周一", "4",
"09:00~10:20\n10:40~12:00\n13:00~14:20\n14:40~16:00", "8",
"三相异步电动机操作(实操)(上午:第一批,下午:第二批)", "张老师", "18");
setImportRow(table.getRow(2), "", "", "", "",
"安全隐患识别及整改措施(实操)(上午:第二批,下午:第一批)", "李老师", "");
// 复刻用户附件的真实结构:公共列首行使用 restart,下一行只保留无 val 的
// <w:vMerge/>。Word 页面会显示首行内容,但 POI 直接读取续行时得到空字符串。
for (int column : Arrays.asList(0, 1, 2, 3, 6)) {
setVerticalMerge(table, column, 1, 2);
}
CourseAdminServiceImpl.ParsedImport parsed =
service.parseImportDocument(document, managedClass);
assertEquals(2, parsed.getCourses().size());
CourseAdminSaveDTO morning = parsed.getCourses().get(0);
CourseAdminSaveDTO afternoon = parsed.getCourses().get(1);
assertEquals(Date.valueOf(LocalDate.of(2026, 12, 7)), morning.getDate());
assertEquals(Date.valueOf(LocalDate.of(2026, 12, 7)), afternoon.getDate());
assertEquals(Arrays.asList("09:00-10:20", "10:40-12:00"), morning.getTimeFrames());
assertEquals(Arrays.asList("13:00-14:20", "14:40-16:00"), afternoon.getTimeFrames());
assertEquals(2, morning.getSubjectTimes());
assertEquals(2, afternoon.getSubjectTimes());
assertEquals(0, new BigDecimal("4").compareTo(morning.getSubjectHour()));
assertEquals(0, new BigDecimal("4").compareTo(afternoon.getSubjectHour()));
assertEquals("teacher-1", morning.getTeacherId());
assertEquals("teacher-2", afternoon.getTeacherId());
assertEquals("三相异步电动机操作(实操)", morning.getSubjectName());
assertEquals("安全隐患识别及整改措施(实操)", afternoon.getSubjectName());
}
}
@Test @Test
void exportShouldReuseReferenceWordTemplateAndRemainImportable() throws Exception { void exportShouldReuseReferenceWordTemplateAndRemainImportable() throws Exception {
CourseAdminDetailVO classDetail = new CourseAdminDetailVO(); CourseAdminDetailVO classDetail = new CourseAdminDetailVO();
...@@ -738,6 +791,25 @@ class CourseAdminServiceImplTest { ...@@ -738,6 +791,25 @@ class CourseAdminServiceImplTest {
} }
} }
/**
* 为测试表格创建与 Word 文件一致的纵向合并 XML。
* 首行显式标记 restart,续行故意不设置 val,以覆盖附件中最常见的 <w:vMerge/> 写法。
*/
private void setVerticalMerge(XWPFTable table, int column, int firstRow, int lastRow) {
for (int rowIndex = firstRow; rowIndex <= lastRow; rowIndex++) {
CTTcPr properties = table.getRow(rowIndex).getCell(column).getCTTc().isSetTcPr()
? table.getRow(rowIndex).getCell(column).getCTTc().getTcPr()
: table.getRow(rowIndex).getCell(column).getCTTc().addNewTcPr();
CTVMerge merge = properties.isSetVMerge()
? properties.getVMerge() : properties.addNewVMerge();
if (rowIndex == firstRow) {
merge.setVal(STMerge.RESTART);
} else if (merge.isSetVal()) {
merge.unsetVal();
}
}
}
private void mockWritableClass() { private void mockWritableClass() {
when(classSubjectMapper.lockAdminCourseClass(1)).thenReturn(1); when(classSubjectMapper.lockAdminCourseClass(1)).thenReturn(1);
ClassEntity managedClass = new ClassEntity(); ClassEntity managedClass = new ClassEntity();
......
...@@ -73,6 +73,32 @@ class TheoreticalLibraryImportPreviewServiceImplTest { ...@@ -73,6 +73,32 @@ class TheoreticalLibraryImportPreviewServiceImplTest {
verify(theoreticalLibraryMapper).selectList(any()); verify(theoreticalLibraryMapper).selectList(any());
} }
@Test
void previewShouldNotTreatAbbreviationsAsAnswerCandidatesForTrueFalseQuestion()
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, "判断题");
// 精确复现原文件第 702 行:EEQ、COD 是正文缩写,答案只能是题尾的“×”。
cell(sheet, 9, "雌激素当量(EEQ)是衡量水中所有化学需氧量(COD)的指标。(×)");
});
TheoreticalLibraryImportPreviewVO result = service.preview(file);
assertEquals(0, result.getAbnormalCount());
TheoreticalLibraryImportQuestionVO question = result.getNormalQuestions().get(0);
assertEquals("×", question.getAnswer());
assertEquals("雌激素当量(EEQ)是衡量水中所有化学需氧量(COD)的指标。",
question.getProblem());
assertEquals(0, question.getAnswerCandidates().size());
assertTrue(question.getIssues().stream().noneMatch(issue ->
"ANSWER_BRACKET_AMBIGUOUS".equals(issue.getCode())));
}
@Test @Test
void previewShouldReportOptionDiscontinuityAndMissingAnswerOption() throws Exception { void previewShouldReportOptionDiscontinuityAndMissingAnswerOption() throws Exception {
when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList()); when(theoreticalLibraryMapper.selectList(any())).thenReturn(Collections.emptyList());
......
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