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 9e875451..651b05c3 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 @@ -11,6 +11,7 @@ import com.xboe.api.vo.*; import com.xboe.module.course.vo.TeacherVo; import com.xboe.module.usergroup.entity.UserGroupItem; import com.xboe.module.usergroup.service.IUserGroupService; +import com.xboe.school.study.dao.StudyCourseDao; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,7 +66,10 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - + + @Autowired + StudyCourseDao scDao; + @Autowired IStudyCourseService service; @@ -695,18 +699,23 @@ public class StudyCourseApi extends ApiBaseController{ } @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) - public JsonResponse findStudyCourseItem(String studyId,String contentId){ + public JsonResponse findStudyCourseItem(String studyId,String contentId,Integer contentTotal, 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());