Exam/pengchen-exam-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【修改】删除配置文件定时任务限制，【新增】浏览器考点设置

Browse Source
This commit is contained in:
YOHO\20373
2025-05-25 00:18:49 +08:00
parent 1ea6a428c6
commit aac170bad9
6 changed files with 167 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java
View File

@@ -207,7 +207,22 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService
@Override
public List<String> getKeywords() {
return educationPaperTaskMapper.getKeywords();
List<String> keywords = educationPaperTaskMapper.getKeywords();
// 使用 Set 去重
Set<String> keywordSet = new HashSet<>();
for (String keywordStr : keywords) {
if (keywordStr != null && !keywordStr.trim().isEmpty()) {
String[] split = keywordStr.split(",");
for (String kw : split) {
String trimmed = kw.trim();
if (!trimmed.isEmpty()) {
keywordSet.add(trimmed);
}
}
}
}
return new ArrayList<>(keywordSet);
}
@Override

84
exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/question/ExamQuestionServiceImpl.java
View File

@@ -202,34 +202,55 @@ public class ExamQuestionServiceImpl implements IExamQuestionService
List<ExamQuestionAnswer> answerList = examQuestion.getAnswerList();
List<SysFileUpload> fileUploads = examQuestion.getFileUploads();
ExamQuestionScore questionScore = examQuestion.getQuestionScores();
List<ExamQuestionKeyword> examQuestionKeywords = examQuestion.getQuestionKeywords();
if (answerList!=null&&answerList.size()>0){
// 获取集合中第一个元素的quId
String firstQuId = answerList.get(0).getQuId();
//先删除试题的答案
examQuestionAnswerMapper.deleteExamQuestionAnswerByQuesId(firstQuId);
//赋值
answerList.replaceAll(answer -> {
answer.setAnswerId(IdUtils.simpleUUID());
answer.setQuId(firstQuId);
return answer;
});
//插入试题答案
examQuestionAnswerMapper.insertExamQuestionAnswerList(answerList);
if (!(("Mysql".equals(examQuestion.getCourseName()))&&("程序设计".equals(examQuestion.getSubjectName())))){
if (answerList!=null&&answerList.size()>0){
//先删除试题的答案
examQuestionAnswerMapper.deleteExamQuestionAnswerByQuesId(examQuestion.getQuId());
//赋值
answerList.replaceAll(answer -> {
answer.setAnswerId(IdUtils.simpleUUID());
answer.setQuId(examQuestion.getQuId());
return answer;
});
//插入试题答案
examQuestionAnswerMapper.insertExamQuestionAnswerList(answerList);
}
}
if (fileUploads!=null&&fileUploads.size()>0){
// 获取集合中第一个元素的quId
String firstQuId = fileUploads.get(0).getQuId();
//先删除试题的答案
sysFileMapper.deleteSysFileByQuesId(firstQuId);
sysFileMapper.deleteSysFileByQuesId(examQuestion.getQuId());
//赋值
fileUploads.replaceAll(fileUpload -> {
// 设置文件名（如果文件名为空）
if (!StringUtils.isNotBlank(fileUpload.getFileName())) {
switch (fileUpload.getFileType()) {
case "0":
fileUpload.setFileName("素材");
break;
case "1":
fileUpload.setFileName("原始");
break;
case "2":
fileUpload.setFileName("结果");
break;
default:
fileUpload.setFileName(null);
break;
}
}
if (StringUtils.isNotBlank(fileUpload.getFileName())) {
fileUpload.setFileName(null);
}
// 设置 fileId 和 quId
fileUpload.setFileId(IdUtils.simpleUUID());
fileUpload.setQuId(firstQuId);
fileUpload.setQuId(examQuestion.getQuId());
return fileUpload;
});
//插入试题答案
@@ -237,22 +258,20 @@ public class ExamQuestionServiceImpl implements IExamQuestionService
}
if (questionScore!=null){
String firstQuId = questionScore.getQuId();
//先删除试题的判分
examQuestionScoreMapper.deleteExamQuestionScoreByQuesId(firstQuId);
examQuestionScoreMapper.deleteExamQuestionScoreByQuesId(examQuestion.getQuId());
//赋值
questionScore.setScoreId(IdUtils.simpleUUID());
questionScore.setQuId(firstQuId);
questionScore.setQuId(examQuestion.getQuId());
examQuestionScoreMapper.insertExamQuestionScore(questionScore);
}
if (examQuestionKeywords!=null&&examQuestionKeywords.size()>0){
String firstQuId = questionScore.getQuId();
//先删除试题的判分
examQuestionKeywordMapper.deleteExamQuestionScoreByQuesId(firstQuId);
examQuestionKeywordMapper.deleteExamQuestionScoreByQuesId(examQuestion.getQuId());
//赋值
examQuestionKeywords.replaceAll(examQuestionKeyword -> {
examQuestionKeyword.setKeywordId(IdUtils.simpleUUID());
examQuestionKeyword.setQuId(firstQuId);
examQuestionKeyword.setQuId(examQuestion.getQuId());
return examQuestionKeyword;
});
examQuestionKeywordMapper.insertExamQuestionKeywordList(examQuestionKeywords);
@@ -416,14 +435,17 @@ public class ExamQuestionServiceImpl implements IExamQuestionService
for (QuestionExamineDO questionExamineDO : list) {
String schoolName =questionExamineMapper.selectSchoolName(questionExamineDO.getSource());
ExamQuestion examQuestion = examQuestionMapper.selectExamQuestionByQuId(questionExamineDO.getQuId());
examQuestion.setCreateTeacher(questionExamineDO.getCreateTeacher());
examQuestion.setSchoolName(schoolName);
examQuestion.setSource(questionExamineDO.getSource());
examQuestion.setType(questionExamineDO.getType());
examQuestion.setCreateTime(questionExamineDO.getCreateTime());
examQuestion.setUpdateTime(questionExamineDO.getUpdateTime());
examQuestion.setUpdater(questionExamineDO.getUpdater());
examQuestionList.add(examQuestion);
if (examQuestion!=null){
examQuestion.setCreateTeacher(questionExamineDO.getCreateTeacher());
examQuestion.setSchoolName(schoolName);
examQuestion.setSource(questionExamineDO.getSource());
examQuestion.setType(questionExamineDO.getType());
examQuestion.setCreateTime(questionExamineDO.getCreateTime());
examQuestion.setUpdateTime(questionExamineDO.getUpdateTime());
examQuestion.setUpdater(questionExamineDO.getUpdater());
examQuestionList.add(examQuestion);
}
}
}
PageResult<ExamQuestion> examQuestionPageResult=new PageResult<>();