hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy0823-llf' into master-0705

Browse Source
This commit is contained in:
nisen
2024-08-23 18:30:42 +08:00
parent 3fc8ce614d 06415d58ac
commit 23e63062e9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -67,8 +67,7 @@ import javax.servlet.http.HttpServletRequest;
@RequestMapping(value="/xboe/school/study/course") @RequestMapping(value="/xboe/school/study/course")
public class StudyCourseApi extends ApiBaseController{ public class StudyCourseApi extends ApiBaseController{
@Autowired
StudyCourseDao scDao;
@Autowired @Autowired
IStudyCourseService service; IStudyCourseService service;
@@ -727,23 +726,18 @@ public class StudyCourseApi extends ApiBaseController{
@RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST})
public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId,Integer contentTotal, HttpServletRequest request){ public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){
if(StringUtils.isBlank(studyId)){ if(StringUtils.isBlank(studyId)){
return error("无学习信息"); return error("无学习信息");
} }
if(StringUtils.isBlank(contentId)){ if(StringUtils.isBlank(contentId)){
return error("无课程内容信息"); return error("无课程内容信息");
} }
String token = request.getHeader("Xboe-Access-Token");
if (StringUtils.isEmpty(token)) {
token = request.getHeader("token");
}
try { try {
StudyCourseItem rs=studyService.checkHas(studyId, contentId); StudyCourseItem rs=studyService.checkHas(studyId, contentId);
if(rs==null) { if(rs==null) {
return notfound(); return notfound();
} }
scDao.finishCheck(studyId,contentId,contentTotal,token);
return success(rs); return success(rs);
}catch(Exception e) { }catch(Exception e) {
log.error("查询课程学习记录错误",e.getMessage()); log.error("查询课程学习记录错误",e.getMessage());

6
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import com.xboe.api.ThirdApi; import com.xboe.api.ThirdApi;
import com.xboe.school.study.dao.StudyCourseDao;
import com.xboe.school.study.entity.StudyCourse; import com.xboe.school.study.entity.StudyCourse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest;
@RestController @RestController
@RequestMapping(value="/xboe/school/study/exam") @RequestMapping(value="/xboe/school/study/exam")
public class StudyExamApi extends ApiBaseController{ public class StudyExamApi extends ApiBaseController{
@Autowired
StudyCourseDao scDao;
@Autowired @Autowired
IStudyExamService sexamService; IStudyExamService sexamService;
@@ -54,7 +57,7 @@ public class StudyExamApi extends ApiBaseController{
} }
@PostMapping("/save") @PostMapping("/save")
public JsonResponse<StudyExam> save(@RequestBody StudyExam exam, HttpServletRequest request){ public JsonResponse<StudyExam> save(@RequestBody StudyExam exam,Integer contentTotal, HttpServletRequest request){
if(StringUtils.isBlank(exam.getCourseId())) { if(StringUtils.isBlank(exam.getCourseId())) {
return badRequest("无课程信息"); return badRequest("无课程信息");
} }
@@ -97,6 +100,7 @@ public class StudyExamApi extends ApiBaseController{
//执行完毕 清除redis记录 //执行完毕 清除redis记录
redisTemplate.delete(key); redisTemplate.delete(key);
scDao.finishCheck(exam.getStudyId(),exam.getContentId(),contentTotal,token);
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);