Merge branch 'zcwy0823-llf' into master-0705

This commit is contained in:
nisen
2024-08-23 19:28:25 +08:00
2 changed files with 11 additions and 15 deletions

View File

@@ -72,17 +72,17 @@ public class StudyExamApi extends ApiBaseController{
token = request.getHeader("token");
}
try {
String key = exam.getStudyId() + "_" + exam.getContentId();
// String key = exam.getStudyId() + "_" + exam.getContentId();
//判断是否存在redis
if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(key))){
log.info("------------试卷提交验证中,请等待! ");
return error("","试卷提交验证中,请等待");
}
//加入redis 2分钟过期
redisTemplate.opsForValue().set(key,key);
//设置过期时间为1天
redisTemplate.expire(key, 5 * 60, TimeUnit.SECONDS);
log.info("------------设置redis-key ,请等待! " + LocalDateTime.now() + ", key = " + redisTemplate.opsForValue().get(key));
// if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(key))){
// log.info("------------试卷提交验证中,请等待! ");
// return error("","试卷提交验证中,请等待");
// }
// //加入redis 2分钟过期
// redisTemplate.opsForValue().set(key,key);
// //设置过期时间为1天
// redisTemplate.expire(key, 5 * 60, TimeUnit.SECONDS);
// log.info("------------设置redis-key ,请等待! " + LocalDateTime.now() + ", key = " + redisTemplate.opsForValue().get(key));
CurrentUser cu=getCurrent();
@@ -99,8 +99,7 @@ public class StudyExamApi extends ApiBaseController{
exam.setPaperJson("");
//执行完毕 清除redis记录
redisTemplate.delete(key);
scDao.finishCheck(exam.getStudyId(),exam.getContentId(),exam.getContentTotal(),token);
// redisTemplate.delete(key);
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
return success(exam);

View File

@@ -133,7 +133,4 @@ public class StudyExam extends IdEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Column(name = "last_time")
private LocalDateTime lastTime;
/**内容的总数量*/
private Integer contentTotal;
}