diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 7e92a759..6370d965 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -67,8 +67,7 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - @Autowired - StudyCourseDao scDao; + @Autowired IStudyCourseService service; @@ -700,23 +699,18 @@ public class StudyCourseApi extends ApiBaseController{ @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) - public JsonResponse findStudyCourseItem(String studyId,String contentId,Integer contentTotal, HttpServletRequest request){ + public JsonResponse findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){ if(StringUtils.isBlank(studyId)){ return error("无学习信息"); } if(StringUtils.isBlank(contentId)){ return error("无课程内容信息"); } - String token = request.getHeader("Xboe-Access-Token"); - if (StringUtils.isEmpty(token)) { - token = request.getHeader("token"); - } try { StudyCourseItem rs=studyService.checkHas(studyId, contentId); if(rs==null) { return notfound(); } - scDao.finishCheck(studyId,contentId,contentTotal,token); return success(rs); }catch(Exception e) { log.error("查询课程学习记录错误",e.getMessage()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java index fd9fdd66..86f03ca9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import com.xboe.api.ThirdApi; +import com.xboe.school.study.dao.StudyCourseDao; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(value="/xboe/school/study/exam") public class StudyExamApi extends ApiBaseController{ + @Autowired + StudyCourseDao scDao; @Autowired IStudyExamService sexamService; @@ -54,7 +57,7 @@ public class StudyExamApi extends ApiBaseController{ } @PostMapping("/save") - public JsonResponse save(@RequestBody StudyExam exam, HttpServletRequest request){ + public JsonResponse save(@RequestBody StudyExam exam,Integer contentTotal, HttpServletRequest request){ if(StringUtils.isBlank(exam.getCourseId())) { return badRequest("无课程信息"); } @@ -97,6 +100,7 @@ public class StudyExamApi extends ApiBaseController{ //执行完毕 清除redis记录 redisTemplate.delete(key); + scDao.finishCheck(exam.getStudyId(),exam.getContentId(),contentTotal,token); List allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(exam);