From 73c2e8b54a2033ed6a60a2be24d7db10c5ac06e2 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Sat, 25 May 2024 19:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/api/ThirdApi.java | 4 ++-- .../com/xboe/module/course/vo/StudyCourseVo.java | 6 +++--- .../com/xboe/school/study/api/StudyCourseApi.java | 12 +++++++++--- .../src/main/resources/application.properties | 6 +++--- 4 files changed, 17 insertions(+), 11 deletions(-) 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 ee17cd40..272d2560 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 @@ -194,10 +194,10 @@ 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){ 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..f39d2e6f 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,7 +349,7 @@ 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); //学习记录成功后处理 @@ -491,7 +491,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 +501,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..7f8192bc 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://localhost: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