joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

生成课程、考试时：如果课程下有试卷，不生成试卷；如果没有试卷，生成默认试卷

Browse Source
This commit is contained in:
joylink_zhangsai 2020-12-04 20:10:58 +08:00
parent 64f5ec3d7b
commit b4876fa189
3 changed files with 75 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/club/joylink/rtss/services/ExamService.java
View File

@ -536,6 +536,13 @@ public class ExamService implements IExamService{
// }
}
@Override
public List<ExamDefinition> findEntities(Long lessonId) {
ExamDefinitionExample example = new ExamDefinitionExample();
example.createCriteria().andLessonIdEqualTo(lessonId);
return examDefinitionDAO.selectByExample(example);
}
private List<ExamDefinition> findEntityByLessonIdList(ArrayList<Long> lessonIdList) {
ExamDefinitionExample example = new ExamDefinitionExample();
example.createCriteria().andLessonIdIn(lessonIdList);

23
src/main/java/club/joylink/rtss/services/IExamService.java
View File

@ -1,7 +1,11 @@
package club.joylink.rtss.services;
import club.joylink.rtss.entity.ExamDefinition;
import club.joylink.rtss.vo.UserVO;
import club.joylink.rtss.vo.client.*;
import club.joylink.rtss.vo.client.ExamDefinitionQueryVO;
import club.joylink.rtss.vo.client.ExamDefinitionVO;
import club.joylink.rtss.vo.client.ExamsLessonVO;
import club.joylink.rtss.vo.client.PageVO;
import java.util.List;
import java.util.Map;
@ -26,14 +30,11 @@ public interface IExamService {
/**
* 查询课程所属产品下有实训的实训类型
* @param lessonId
* @return
*/
List<String> queryTrainingTypes(Long lessonId);
/**
* 查询试题定义的详细信息
* @param examId
*/
ExamDefinitionVO queryExamInfo(Long examId);
@ -59,32 +60,28 @@ public interface IExamService {
/**
* 根据课程和实训类型查询实训数量
* @param lessonId
* @param trainingType
* @return
*/
Long queryTrainingNum(Long lessonId, String trainingType, String operateType);
/**
* 试题上线
* @param id
* @param userVO
*/
void onLine(Long id, UserVO userVO);
/**
* 试题下线
* @param id
* @param userVO
*/
void offLine(Long id, UserVO userVO);
/**
* 更新试题
* @param id
* @param examDefinitionVO
*/
void update(Long id, ExamDefinitionVO examDefinitionVO);
void copy(Map<Long, Long> lessonRelationMap, UserVO user);
/**
* 根据课程id查询考试
*/
List<ExamDefinition> findEntities(Long lessonId);
}

29
src/main/java/club/joylink/rtss/services/LessonService.java
View File

@ -619,7 +619,7 @@ public class LessonService implements ILessonService {
if (Objects.nonNull(existedDefaultLesson)) {
lesson.setId(existedDefaultLesson.getId());
lessonDAO.updateByPrimaryKey(lesson);
//存在默认课程删除旧版本、章节、考试及关联实训数据
//存在默认课程删除旧版本、章节、章节关联的实训
LsLessonVersionExample versionExample = new LsLessonVersionExample();
versionExample.createCriteria().andLessonIdEqualTo(existedDefaultLesson.getId());
lessonVersionDAO.deleteByExample(versionExample);
@ -632,21 +632,21 @@ public class LessonService implements ILessonService {
chapterExample.createCriteria().andLessonIdEqualTo(existedDefaultLesson.getId());
lessonChapterDAO.deleteByExample(chapterExample);
ExamDefinitionExample examDefinitionExample = new ExamDefinitionExample();
examDefinitionExample.createCriteria().andLessonIdEqualTo(existedDefaultLesson.getId());
List<ExamDefinition> examDefinitions = examDefinitionDAO.selectByExample(examDefinitionExample);
if (!CollectionUtils.isEmpty(examDefinitions)) {
List<Long> list = examDefinitions.stream().map(ExamDefinition::getId).collect(Collectors.toList());
ExamDefinitionRulesExample rulesExample = new ExamDefinitionRulesExample();
rulesExample.createCriteria().andExamIdIn(list);
definitionRulesDAO.deleteByExample(rulesExample);
examDefinitionDAO.deleteByExample(examDefinitionExample);
}
// ExamDefinitionExample examDefinitionExample = new ExamDefinitionExample();
// examDefinitionExample.createCriteria().andLessonIdEqualTo(existedDefaultLesson.getId());
// List<ExamDefinition> examDefinitions = examDefinitionDAO.selectByExample(examDefinitionExample);
// if (!CollectionUtils.isEmpty(examDefinitions)) {
// List<Long> list = examDefinitions.stream().map(ExamDefinition::getId).collect(Collectors.toList());
// ExamDefinitionRulesExample rulesExample = new ExamDefinitionRulesExample();
// rulesExample.createCriteria().andExamIdIn(list);
// definitionRulesDAO.deleteByExample(rulesExample);
// examDefinitionDAO.deleteByExample(examDefinitionExample);
// }
} else {
lessonDAO.insert(lesson);
}
//版本0.0
//课程版本0.0
LsLessonVersion lessonVersion = new LsLessonVersion();
lessonVersion.setLessonId(lesson.getId());
lessonVersion.setCreatorId(lesson.getCreatorId());
@ -654,6 +654,7 @@ public class LessonService implements ILessonService {
lessonVersion.setVersion(BusinessConsts.Lesson.Version.originalVersion);
lessonVersionDAO.insert(lessonVersion);
//生成课程的章节
List<Training> examTrainings = new ArrayList<>(20);
int orderNum = 1;
Random random = new Random();
@ -687,6 +688,8 @@ public class LessonService implements ILessonService {
}
});
}
List<ExamDefinition> exams = iExamService.findEntities(lesson.getId());
if (CollectionUtils.isEmpty(exams)) {
//试卷定义
if (CollectionUtils.isEmpty(examTrainings)) {
return;
@ -714,7 +717,6 @@ public class LessonService implements ILessonService {
examRules.setOperateType(training.getOperateType());
definitionRulesDAO.insert(examRules);
});
} else {
examDefinition.setFullPoint(100);
examDefinition.setPassingPoint(60);
@ -732,4 +734,5 @@ public class LessonService implements ILessonService {
} while (i++ < 20);
}
}
}
}