Commit 9a033119 authored by wujipeng's avatar wujipeng
Browse files

优化

parent a42e9ca3
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -21,6 +22,10 @@ public class ExamReviewPracticeItemVO {
private String result;
private byte[] file;
private String fileFormat;
@ApiModelProperty("第三方提供的本题基础分值,仅用于阅卷页面展示和汇总")
private Double basicScore;
private Double score;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
......
......@@ -313,7 +313,8 @@ public class ExamReviewServiceImpl implements ExamReviewService {
/**
* 实训评分直接更新第三方明细的当前有效分值,但不提前修改正式发布标记。
* 因第三方协议没有单项满分,只能校验单项非负以及调整后总和不超过考试总分。
* basicScore仅用于工作台展示和汇总,不作为教师复核分数的单项上限;保存时仍按既定
* 规则校验单项非负以及调整后总和不超过考试总分。
*/
private ExamReviewPaperVO savePracticeScores(ExamStudentEntity student,
ExamReviewTaskVO task,
......@@ -379,13 +380,43 @@ public class ExamReviewServiceImpl implements ExamReviewService {
return paper(student.getId(), teacherId);
}
/** 实训工作台不伪造题目满分或理论题型汇总,只返回第三方可稳定提供的字段。 */
/**
* 组装实训工作台数据。
*
* <p>第三方basicScore表示页面需要展示的单题基础分值,因此按题型聚合为中栏打分情况;
* score仍表示教师可复核的当前得分。历史数据可能没有basicScore,汇总时按0处理,
* 但practiceItems中的原始null保持不变,便于调用方区分“基础分为0”和“历史未提供”。</p>
*/
private ExamReviewPaperVO assemblePracticePaper(ExamReviewTaskVO task,
ExamReviewStudentVO student,
List<ExamReviewPracticeItemVO> items) {
Map<String, ExamReviewScoreSummaryVO> summaryMap = new LinkedHashMap<>();
double currentTotal = 0D;
for (ExamReviewPracticeItemVO item : items) {
currentTotal += item.getScore() == null ? 0D : item.getScore();
String type = trimToNull(item.getType());
if (type == null) {
type = "其他";
}
ExamReviewScoreSummaryVO summary = summaryMap.get(type);
if (summary == null) {
summary = new ExamReviewScoreSummaryVO();
summary.setType(type);
summary.setQuestionCount(0);
summary.setReviewedCount(0);
summary.setMaxScore(0D);
summary.setActualScore(0D);
summary.setCompleted(true);
summaryMap.put(type, summary);
}
double actualScore = item.getScore() == null ? 0D : item.getScore();
double basicScore = item.getBasicScore() == null ? 0D : item.getBasicScore();
summary.setQuestionCount(summary.getQuestionCount() + 1);
// 第三方上报的是一份完整成绩快照,返回到工作台的每条实训明细均视为已评分。
summary.setReviewedCount(summary.getReviewedCount() + 1);
summary.setMaxScore(summary.getMaxScore() + basicScore);
summary.setActualScore(summary.getActualScore() + actualScore);
currentTotal += actualScore;
}
ExamReviewPaperVO paper = new ExamReviewPaperVO();
paper.setExamId(task.getExamId());
......@@ -398,7 +429,7 @@ public class ExamReviewServiceImpl implements ExamReviewService {
paper.setPaperTotal(task.getPaperTotal());
paper.setDuration(task.getDuration());
paper.setStudent(student);
paper.setScoreSummaries(Collections.emptyList());
paper.setScoreSummaries(new ArrayList<>(summaryMap.values()));
paper.setQuestions(Collections.emptyList());
paper.setPracticeItems(items);
paper.setCurrentTotalScore(currentTotal);
......
......@@ -209,7 +209,9 @@ public class FzGradesServiceImpl extends ServiceImpl<FzGradesMapper, FzGradesEnt
&& Objects.equals(left.getResult(), right.getResult())
&& Arrays.equals(left.getFile(), right.getFile())
&& Objects.equals(left.getFileFormat(), right.getFileFormat())
&& Double.compare(left.getScore(), right.getScore()) == 0;
&& Double.compare(left.getScore(), right.getScore()) == 0
// basicScore决定阅卷页面展示的单题分值,变化时不能误判为相同快照。
&& Objects.equals(left.getBasicScore(), right.getBasicScore());
}
private String requireText(String value, String field, int maxLength) {
......
......@@ -218,7 +218,8 @@
resultType="com.platform.business.model.vo.ExamReviewPracticeItemVO">
SELECT
g.id, g.code, g.lev AS level, g.title, g.type, g.options, g.mark,
g.text, g.result, g.file, g.file_format AS fileFormat, g.score,
g.text, g.result, g.file, g.file_format AS fileFormat,
g.basic_score AS basicScore, g.score,
g.start_time AS startTime, g.submission_time AS submissionTime
FROM fz_grades g
INNER JOIN (
......
......@@ -44,7 +44,9 @@
`GET /exam/review/students/{examStudentId}/paper`
返回`examType`和考试类型对应的互斥明细。理论考试返回试卷元数据、题型汇总及`questions`;
实训考试返回第三方`practiceItems`,其中明细`id`用于后续保存评分,`questions`为空数组。
实训考试返回第三方`practiceItems`,其中明细`id`用于后续保存评分,`basicScore`为第三方提供的
单题展示分值,`score`为当前得分;`scoreSummaries`按实训题型汇总题数、基础分和当前得分,
`questions`为空数组。历史明细未提供`basicScore`时,原始字段返回`null`且汇总按0计算。
## 4. 保存阅卷进度
......@@ -64,7 +66,8 @@
理论考试可仅提交本次变化的主观题,并校验`0 <= score <= 题目满分`;实训考试可提交变化的项目,
校验单项非负且调整后汇总不超过考试总分。保存成功后写入审计日志,
但不会把暂存结果标记为正式发布。已发布的考生成绩不可再次修改。
但不会把暂存结果标记为正式发布。实训`basicScore`仅用于展示和汇总,不作为单题保存上限。
已发布的考生成绩不可再次修改。
## 5. 发布成绩
......
......@@ -23,6 +23,7 @@ CREATE TABLE IF NOT EXISTS fz_grades (
result LONGTEXT NULL COMMENT '判定结果',
file TEXT NULL COMMENT '附件地址或标识',
score DECIMAL(10,2) NOT NULL DEFAULT 0 COMMENT '本题实际得分',
basic_score DECIMAL(10,2) NULL COMMENT '第三方提供的本题基础分值,仅用于展示和汇总',
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
COMMENT='仿真实训逐题成绩明细';
......@@ -52,6 +53,18 @@ begin
deallocate prepare paper_nullable_stmt;
end if;
-- 老环境可能已存在fz_grades表;以可空列增量补齐,历史记录无需回填即可兼容查询。
if not exists (
select 1 from information_schema.columns
where table_schema = database() and table_name = 'fz_grades'
and column_name = 'basic_score'
) then
alter table fz_grades
add column basic_score decimal(10,2) null
comment '第三方提供的本题基础分值,仅用于展示和汇总'
after score;
end if;
-- 完整成绩上报和单个学员详情均先按考试、学员、题号缩小范围。
if not exists (
select 1 from information_schema.statistics
......
package com.platform.business.service.impl;
import com.platform.business.constant.ExamAdminConstants;
import com.platform.business.mapper.ExamReviewMapper;
import com.platform.business.mapper.ExamReviewScoreLogMapper;
import com.platform.business.model.dto.ExamReviewSaveDTO;
......@@ -22,6 +23,7 @@ import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
......@@ -202,13 +204,14 @@ class ExamReviewServiceImplTest {
.submit(true).markFlag(false).build();
ExamReviewTaskVO task = new ExamReviewTaskVO();
task.setExamId(200);
task.setExamType("实训");
task.setExamType(ExamAdminConstants.TYPE_PRACTICE);
task.setPaperTotal(100D);
FzGradesEntity locked = new FzGradesEntity();
locked.setId("practice-1");
locked.setExamId(200);
locked.setUserId("student-2");
locked.setScore(20D);
locked.setBasicScore(20D);
when(examReviewMapper.lockStudent(20, "teacher-1")).thenReturn(student);
when(examReviewMapper.findTask(200, "teacher-1")).thenReturn(task);
when(examReviewMapper.lockPracticeItems(any(), anyInt(), any()))
......@@ -236,13 +239,15 @@ class ExamReviewServiceImplTest {
.submit(true).markFlag(false).build();
ExamReviewTaskVO task = new ExamReviewTaskVO();
task.setExamId(200);
task.setExamType("实训");
task.setExamType(ExamAdminConstants.TYPE_PRACTICE);
task.setPaperTotal(100D);
FzGradesEntity locked = new FzGradesEntity();
locked.setId("practice-1");
locked.setExamId(200);
locked.setUserId("student-2");
locked.setScore(20D);
// basicScore只用于展示;本用例将得分由20改为25,验证不会增加单题上限校验。
locked.setBasicScore(20D);
when(examReviewMapper.lockStudent(20, "teacher-1")).thenReturn(student);
when(examReviewMapper.findTask(200, "teacher-1")).thenReturn(task);
when(examReviewMapper.lockPracticeItems(any(), anyInt(), any()))
......@@ -259,6 +264,7 @@ class ExamReviewServiceImplTest {
ExamReviewPracticeItemVO responseItem = new ExamReviewPracticeItemVO();
responseItem.setId("practice-1");
responseItem.setScore(25D);
responseItem.setBasicScore(20D);
when(examReviewMapper.queryPracticeItems(200, "student-2"))
.thenReturn(Collections.singletonList(responseItem));
......@@ -276,11 +282,52 @@ class ExamReviewServiceImplTest {
verify(scoreLogMapper).insert(any(ExamReviewScoreLogEntity.class));
}
@Test
void practicePaperShouldExposeBasicScoreAndBuildTypeSummaries() {
ExamReviewStudentVO student = new ExamReviewStudentVO();
student.setExamStudentId(20);
student.setExamId(200);
student.setStudentId("student-2");
ExamReviewTaskVO task = new ExamReviewTaskVO();
task.setExamId(200);
task.setExamType(ExamAdminConstants.TYPE_PRACTICE);
task.setPaperTotal(100D);
ExamReviewPracticeItemVO objectiveOne = practiceItem(
"practice-1", "客观题", 8D, 10D);
// 历史记录缺少basicScore时,原始字段保持null,但题型满分汇总按0处理。
ExamReviewPracticeItemVO objectiveLegacy = practiceItem(
"practice-2", "客观题", 2D, null);
ExamReviewPracticeItemVO unknownType = practiceItem(
"practice-3", null, 3D, 5D);
when(examReviewMapper.findStudent(20, "teacher-1")).thenReturn(student);
when(examReviewMapper.findTask(200, "teacher-1")).thenReturn(task);
when(examReviewMapper.queryPracticeItems(200, "student-2"))
.thenReturn(Arrays.asList(objectiveOne, objectiveLegacy, unknownType));
ExamReviewPaperVO result = examReviewService.paper(20, "teacher-1");
assertEquals(10D, result.getPracticeItems().get(0).getBasicScore());
assertEquals(null, result.getPracticeItems().get(1).getBasicScore());
assertTrue(result.getQuestions().isEmpty());
assertEquals(13D, result.getCurrentTotalScore());
assertEquals(2, result.getScoreSummaries().size());
assertEquals("客观题", result.getScoreSummaries().get(0).getType());
assertEquals(2, result.getScoreSummaries().get(0).getQuestionCount());
assertEquals(2, result.getScoreSummaries().get(0).getReviewedCount());
assertEquals(10D, result.getScoreSummaries().get(0).getMaxScore());
assertEquals(10D, result.getScoreSummaries().get(0).getActualScore());
assertTrue(result.getScoreSummaries().get(0).getCompleted());
assertEquals("其他", result.getScoreSummaries().get(1).getType());
assertEquals(5D, result.getScoreSummaries().get(1).getMaxScore());
assertEquals(3D, result.getScoreSummaries().get(1).getActualScore());
}
@Test
void publishPracticeShouldSumReviewedItemsWithoutTheoryQueries() {
ExamEntity exam = new ExamEntity();
exam.setId(200);
exam.setType("实训");
exam.setType(ExamAdminConstants.TYPE_PRACTICE);
exam.setTotalScore(new BigDecimal("100"));
ExamStudentEntity student = ExamStudentEntity.builder()
.id(20).examId(200).studentId("student-2")
......@@ -300,4 +347,14 @@ class ExamReviewServiceImplTest {
verify(examReviewMapper, never()).countSubmittedWithoutPaper(200);
verify(examReviewMapper, never()).countUnscoredSubjective(200);
}
private ExamReviewPracticeItemVO practiceItem(String id, String type,
Double score, Double basicScore) {
ExamReviewPracticeItemVO item = new ExamReviewPracticeItemVO();
item.setId(id);
item.setType(type);
item.setScore(score);
item.setBasicScore(basicScore);
return item;
}
}
package com.platform.business.service.impl;
import com.platform.business.constant.ExamAdminConstants;
import com.platform.business.mapper.FzGradesMapper;
import com.platform.business.model.dto.FzGradesDTO;
import com.platform.business.model.entity.ExamEntity;
......@@ -57,6 +58,7 @@ class FzGradesServiceImplTest {
// 服务端按code形成稳定快照,且绝不接受第三方指定本系统主键。
assertEquals("Q-1", captor.getAllValues().get(0).getCode());
assertEquals(null, captor.getAllValues().get(0).getId());
assertEquals(60D, captor.getAllValues().get(0).getBasicScore());
verify(mapper).submitPracticeStudent(eq(9), eq(75D), any(), any(), any(), any());
}
......@@ -85,6 +87,21 @@ class FzGradesServiceImplTest {
verify(mapper, never()).insert(any(FzGradesEntity.class));
}
@Test
void changedBasicScoreShouldNotBeTreatedAsIdenticalReplay() {
mockWritableCandidate();
when(mapper.selectLatestItems(1, "student-1"))
.thenReturn(Collections.singletonList(persisted("Q-1", 10D)));
FzGradesDTO changed = item("Q-1", 10D);
changed.setBasicScore(70D);
BusinessException error = assertThrows(BusinessException.class,
() -> service.receive(Collections.singletonList(changed)));
assertEquals("仿真实训成绩已经接收,后续只能由教师复核调整", error.getMessage());
verify(mapper, never()).insert(any(FzGradesEntity.class));
}
@Test
void mixedStudentsShouldBeRejectedBeforeLockingDatabase() {
FzGradesDTO second = item("Q-2", 20D);
......@@ -130,7 +147,7 @@ class FzGradesServiceImplTest {
private ExamEntity practiceExam() {
ExamEntity exam = new ExamEntity();
exam.setId(1);
exam.setType("实训");
exam.setType(ExamAdminConstants.TYPE_PRACTICE);
exam.setTotalScore(new BigDecimal("100"));
exam.setMarkFlag(false);
return exam;
......@@ -143,6 +160,7 @@ class FzGradesServiceImplTest {
item.setCode(code);
item.setTitle("启动检查");
item.setScore(score);
item.setBasicScore(60D);
return item;
}
......@@ -154,6 +172,7 @@ class FzGradesServiceImplTest {
item.setCode(code);
item.setTitle("启动检查");
item.setScore(score);
item.setBasicScore(60D);
return item;
}
}
......@@ -21,6 +21,10 @@ class PracticeScoreMigrationSqlTest {
assertTrue(sql.contains("ifnull(e.mark_flag, 0) = 0"));
assertTrue(sql.contains("exception_reason"));
assertTrue(sql.contains("paper_id") && sql.contains("is_nullable = 'no'"));
// 新建表和已有表两条路径都必须具备basic_score,防止接口上线后查询旧环境时报未知列。
assertTrue(sql.contains("basic_score decimal(10,2) null"));
assertTrue(sql.contains("column_name = 'basic_score'"));
assertTrue(sql.contains("add column basic_score"));
assertFalse(sql.contains("delete from fz_grades"));
}
......
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