Merge branch 'zcwy0823-llf' into master-0705

This commit is contained in:
nisen
2024-08-23 19:44:02 +08:00

View File

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