Browse Source

bug修复

master
luoweijian 2 months ago
parent
commit
83e338ce8f
  1. 8
      src/main/java/com/project/exam/domain/job/ShortAnswerScoringJob.java
  2. 8
      src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

8
src/main/java/com/project/exam/domain/job/ShortAnswerScoringJob.java

@ -1,6 +1,7 @@
package com.project.exam.domain.job;
import cn.hutool.core.collection.CollectionUtil;
import com.project.base.config.ScheduledTaskProperties;
import com.project.exam.domain.entity.ExamRecordEntity;
import com.project.exam.mapper.ExamRecordMapper;
import com.project.interaction.domain.dto.AiScoringRequestDTO;
@ -69,6 +70,9 @@ public class ShortAnswerScoringJob {
@Value("${scoring.batch-size:5}")
private int batchSize;
@Autowired
private ScheduledTaskProperties taskProps;
@Override
public String toString() {
return "ShortAnswerScoringJob{" +
@ -82,7 +86,9 @@ public class ShortAnswerScoringJob {
@Scheduled(fixedRateString = "${scoring.interval-ms:60000}")
public void processPendingScoring() {
log.debug(">>> [简答题评分任务] 开始扫描待评分简答题, batchSize={}", batchSize);
if ("local".equalsIgnoreCase(taskProps.getOwner())) {
return;
}
try {
// 查询已提交的考试记录
List<ExamRecordEntity> records = examRecordMapper.selectList(

8
src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

@ -2,7 +2,6 @@ package com.project.task.domain.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.EnumUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@ -95,6 +94,13 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
if (Objects.nonNull(param.getClassicPaperSetId())) {
queryWrapper.eq(TaskEntity::getClassicPaperSetId, param.getClassicPaperSetId());
}
if (Objects.nonNull(param.getClassicCategoryParentId())) {
queryWrapper.eq(TaskEntity::getClassicCategoryParentId, param.getClassicCategoryParentId());
}
if (Objects.nonNull(param.getExamMode())) {
queryWrapper.eq(TaskEntity::getExamMode, param.getExamMode());
}
// 考试状态过滤
Date endOfToday = DateUtil.endOfDay(new Date());
Date beginOfToday = DateUtil.beginOfDay(new Date());

Loading…
Cancel
Save