diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index 69e8031e..0e092cb7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -11,13 +11,10 @@ import com.xboe.module.course.vo.TeacherVo; import com.xboe.module.dict.entity.DictDto; import com.xboe.school.study.entity.StudyCourse; import com.xboe.system.user.dao.UserDao; -import com.xboe.system.user.entity.User; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; @@ -194,10 +191,11 @@ public class ThirdApi { Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, DynamicBean.class).success()).map(DynamicBean::getResult).map(UserDynamicResult::getList).stream().flatMap(Collection::stream).forEach(list::add); } - public ListgetStudyCourseList(String studyId,String contentId, String token){ + public ListgetStudyCourseList(String studyId,String courseId, String token){ + System.out.println("------------------getStudyCourseList-----------------------------"); StudyCourseVo studyCourseVo = new StudyCourseVo(); studyCourseVo.setStudyId(studyId); - studyCourseVo.setContentId(contentId); + studyCourseVo.setCourseId(courseId); String resp = Optional.ofNullable( HttpRequest.post(getStudyStatus).body(JSONUtil.toJsonStr(studyCourseVo)).header("token", token).execute() .body()).orElseThrow(() -> new RuntimeException("token校验失败")); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/StudyCourseVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/StudyCourseVo.java index c64332eb..7dd7cf26 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/StudyCourseVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/vo/StudyCourseVo.java @@ -10,7 +10,7 @@ public class StudyCourseVo { private Long userId; private String studyId; - private Long courseId; + private String courseId; private String contentId; public Long getUserId() { @@ -29,11 +29,11 @@ public class StudyCourseVo { this.studyId = studyId; } - public Long getCourseId() { + public String getCourseId() { return courseId; } - public void setCourseId(Long courseId) { + public void setCourseId(String courseId) { this.courseId = courseId; } 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 ea54f107..a6f0e938 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 @@ -328,7 +328,7 @@ public class StudyCourseApi extends ApiBaseController{ if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) { studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress()); } - List allUserList = thirdApi.getStudyCourseList(sci.getStudyId(), sci.getContentId(), token); + List allUserList = thirdApi.getStudyCourseList(sci.getStudyId(), sci.getCourseId(), token); log.info("在线课学习记录"+allUserList); System.out.println("在线课学习记录"+allUserList); //追加学习时长 @@ -349,9 +349,8 @@ public class StudyCourseApi extends ApiBaseController{ sci.setAname(cuser.getName()); studyService.saveStudyInfo(sci); - List allUserList = thirdApi.getStudyCourseList(sci.getStudyId(), sci.getContentId(), token); + List allUserList = thirdApi.getStudyCourseList(sci.getStudyId(), sci.getCourseId(), token); log.info("在线课学习记录"+allUserList); - System.out.println("在线课学习记录"+allUserList); //学习记录成功后处理 studyService.appendStudyDuration(sci.getStudyId(),sci.getStudyItemId(),sci.getContentId(),sci.getDuration()); return success(sci.getStudyItemId()); @@ -491,7 +490,7 @@ public class StudyCourseApi extends ApiBaseController{ * @return */ @PostMapping("/study-video-finish") - public JsonResponse studyVideoFinish(String itemId,String studyId,String courseId,Integer cnum){ + public JsonResponse studyVideoFinish(String itemId,String studyId,String courseId,Integer cnum, HttpServletRequest request){ if(StringUtils.isBlank(itemId)){ return error("参数错误"); } @@ -501,8 +500,14 @@ public class StudyCourseApi extends ApiBaseController{ if(StringUtils.isBlank(courseId)){ return error("课程参数错误"); } + String token = request.getHeader("Xboe-Access-Token"); + if (StringUtils.isEmpty(token)) { + token = request.getHeader("token"); + } try { studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum); + List allUserList = thirdApi.getStudyCourseList(studyId, courseId, token); + log.info("在线课学习记录"+allUserList); return success(true); }catch(Exception e) { log.error("记录内容学习完成错误",e); diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index 3e2e9b14..a841e86f 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -56,8 +56,8 @@ logging.config=classpath:log/logback-@profileActive@.xml # config.id.generator.datacenter.num=1 #boe.domain=https://pretest.zcwytd.com -#boe.domain=https://u.boe.com -boe.domain=http://localhost:30001 +boe.domain=https://u.boe.com +#boe.domain=http://127.0.0.1:30001 orgTree.orgTreeList=${boe.domain}/userbasic/org/list # ????id???????????? orgTree.orgChildTreeList=${boe.domain}/userbasic/org/childOrgs @@ -73,4 +73,4 @@ infrasApi.dict=${boe.domain}/infrasApi/dict/list manageApi.stu.offcourse=${boe.domain}/manageApi/stu/offcourse/getOffCourseId #获取离职教师id userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo -coursesuilt.getStudyStatus=${boe.domain}/stu/project/completeStatus \ No newline at end of file +coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus \ No newline at end of file