From f1b96c8af9f9d4be00c39ff0cfeb755c473fcc78 Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Fri, 1 Nov 2024 11:51:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E8=AF=BE=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/api/ThirdApi.java | 12 ++++++++++++ .../com/xboe/module/course/api/CourseAuditApi.java | 12 ++++++++++-- .../src/main/resources/application.properties | 2 ++ 3 files changed, 24 insertions(+), 2 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 7a55cd36..70796292 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 @@ -72,6 +72,10 @@ public class ThirdApi { @Value("${userBasic.getUserBasicInfo}") private String getUserBasicInfo; + @Value("${coursesuilt.updateOrSaveCourse}") + private String updateOrSaveCourse; + + //获取例外人员的id public List getUserId(){ String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316 @@ -302,4 +306,12 @@ public class ThirdApi { return basicInfos; } + + public void updateOrSaveCourse(String courseId, String token){ + String resp = Optional.ofNullable( + HttpRequest.post(updateOrSaveCourse).body(JSONUtil.toJsonStr(courseId)).header("token", token).execute() + .body()).orElseThrow(() -> new RuntimeException("token校验失败")); + log.info("updateOrSaveCourse = " + resp); + } + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java index ff9892ec..b94929e7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java @@ -5,7 +5,9 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import com.xboe.api.ThirdApi; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -55,7 +57,10 @@ public class CourseAuditApi extends ApiBaseController{ @Resource private ICourseContentService ccontentService; - + @Resource + private ThirdApi thirdApi; + + /** * 教师需要审核的课程 * @param pager @@ -378,7 +383,7 @@ public class CourseAuditApi extends ApiBaseController{ */ @PostMapping("/submit-publish") @AutoLog(module = "课程",action = "默认管理员提交发布",info = "") - public JsonResponse submitAndPublish(@RequestBody CourseFullDto dto){ + public JsonResponse submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){ if(dto.getCourse()==null){ return badRequest("无课程信息"); } @@ -402,12 +407,15 @@ public class CourseAuditApi extends ApiBaseController{ if(StringUtils.isBlank(dto.getCourse().getOrgId())) { return badRequest("请选择资源归属"); } + String token = request.getHeader("Xboe-Access-Token"); + CurrentUser cuser=getCurrent(); dto.getCourse().setStatus(Course.STATUS_AUDIT_FINISH);//设置为审核通过状态 dto.getCourse().setEnabled(true);//设置启用状态问题 dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态 try { courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName()); + thirdApi.updateOrSaveCourse(dto.getCourse().getId(),token); 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 28a89c6e..6e512b42 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -76,3 +76,5 @@ manageApi.editExam=${boe.domain}/manageApi/admin/project/editExam userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus userBasic.getUserBasicInfo=${boe.domain}/userbasic/user/getUserBasicInfo +#讲师管理创建或修改在线课授课记录 +coursesuilt.updateOrSaveCourse=${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse From 1a6c8f8af95de3b13cc2d7f8e8fcd474df32d19d Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Fri, 1 Nov 2024 15:05:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/api/ThirdApi.java | 5 +++-- .../com/xboe/module/course/api/CourseAuditApi.java | 8 +++++++- .../java/com/xboe/module/course/dto/CourseParam.java | 10 ++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseParam.java 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 70796292..de458185 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 @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Opt; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import com.xboe.api.vo.*; +import com.xboe.module.course.dto.CourseParam; import com.xboe.module.course.vo.StudyCourseVo; import com.xboe.module.course.vo.TeacherInfoVo; import com.xboe.module.course.vo.TeacherVo; @@ -307,9 +308,9 @@ public class ThirdApi { } - public void updateOrSaveCourse(String courseId, String token){ + public void updateOrSaveCourse(CourseParam param, String token){ String resp = Optional.ofNullable( - HttpRequest.post(updateOrSaveCourse).body(JSONUtil.toJsonStr(courseId)).header("token", token).execute() + HttpRequest.post(updateOrSaveCourse).body(JSONUtil.toJsonStr(param)).header("token", token).execute() .body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("updateOrSaveCourse = " + resp); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java index b94929e7..f3d73716 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import com.xboe.api.ThirdApi; +import com.xboe.module.course.dto.CourseParam; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -415,7 +416,12 @@ public class CourseAuditApi extends ApiBaseController{ dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态 try { courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName()); - thirdApi.updateOrSaveCourse(dto.getCourse().getId(),token); + + CourseParam param = new CourseParam(); + param.setId(dto.getCourse().getId()); + param.setOrgId(dto.getCourse().getOrgId()); + param.setOrgName(dto.getCourse().getOrgName()); + thirdApi.updateOrSaveCourse(param,token); return success(true); } catch (Exception e) { log.error("默认管理员提交直接发布处理失败",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseParam.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseParam.java new file mode 100644 index 00000000..beb701f5 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseParam.java @@ -0,0 +1,10 @@ +package com.xboe.module.course.dto; + +import lombok.Data; + +@Data +public class CourseParam { + private String id; + private String orgId; + private String orgName; +} From 9faa8307ee2acd610a00aea19f93c592165ef55b Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Sun, 3 Nov 2024 16:08:53 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95=E5=AD=A6=E5=91=98?= =?UTF-8?q?=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 | 9 ++++++++- .../com/xboe/school/study/api/StudyCourseApi.java | 12 ++++++++++-- .../src/main/resources/application.properties | 1 + 3 files changed, 19 insertions(+), 3 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 de458185..f2d14fd5 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 @@ -75,6 +75,8 @@ public class ThirdApi { @Value("${coursesuilt.updateOrSaveCourse}") private String updateOrSaveCourse; + @Value("${coursesuilt.syncCourseStudent}") + private String syncCourseStudent; //获取例外人员的id @@ -314,5 +316,10 @@ public class ThirdApi { .body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("updateOrSaveCourse = " + resp); } - + public void syncCourseStudent(Long courseId, String token){ + String resp = Optional.ofNullable( + HttpRequest.post(syncCourseStudent).body(JSONUtil.toJsonStr(courseId)).header("token", token).execute() + .body()).orElseThrow(() -> new RuntimeException("token校验失败")); + log.info("updateOrSaveCourse = " + resp); + } } 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 dc24355c..59a22632 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 @@ -750,18 +750,26 @@ public class StudyCourseApi extends ApiBaseController{ * @param courseId 课程id 用于删除课程报名信息和修改课程学习人数 * */ @PostMapping("/delete-signup") - public JsonResponse deleteSignUp(String id,String courseId,String studentId){ + public JsonResponse deleteSignUp(String id,String courseId,String studentId, HttpServletRequest request){ if(StringUtils.isBlank(id)){ return badRequest("参数异常"); } //String aid = this.getCurrent().getAccountId(); try { service.deleteSignUp(id,courseId,studentId); - return success(true); } catch (Exception e) { log.error("删除报名信息失败",e.getMessage()); return error("删除失败",e.getMessage()); } + + try { + String token = request.getHeader("Xboe-Access-Token"); + thirdApi.syncCourseStudent(Long.parseLong(courseId),token); + } catch (Exception e) { + e.printStackTrace(); + } + return success(true); + } /** diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index 6e512b42..df1fc99e 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -78,3 +78,4 @@ coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus userBasic.getUserBasicInfo=${boe.domain}/userbasic/user/getUserBasicInfo #讲师管理创建或修改在线课授课记录 coursesuilt.updateOrSaveCourse=${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse +coursesuilt.syncCourseStudent=${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent From 3559553484a604b23d7cba1f34761cadfffc7971 Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Sun, 3 Nov 2024 16:55:53 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=88=E8=AF=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/api/ThirdApi.java | 13 +++++++++++-- .../xboe/module/interaction/api/CourseGradeApi.java | 13 ++++++++++++- .../src/main/resources/application.properties | 1 + 3 files changed, 24 insertions(+), 3 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 f2d14fd5..f6fc0739 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 @@ -6,6 +6,7 @@ import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import com.xboe.api.vo.*; import com.xboe.module.course.dto.CourseParam; +import com.xboe.module.course.dto.ScoreParam; import com.xboe.module.course.vo.StudyCourseVo; import com.xboe.module.course.vo.TeacherInfoVo; import com.xboe.module.course.vo.TeacherVo; @@ -77,7 +78,8 @@ public class ThirdApi { private String updateOrSaveCourse; @Value("${coursesuilt.syncCourseStudent}") private String syncCourseStudent; - + @Value("${coursesuilt.syncOnLineScore}") + private String syncOnLineScore; //获取例外人员的id public List getUserId(){ @@ -320,6 +322,13 @@ public class ThirdApi { String resp = Optional.ofNullable( HttpRequest.post(syncCourseStudent).body(JSONUtil.toJsonStr(courseId)).header("token", token).execute() .body()).orElseThrow(() -> new RuntimeException("token校验失败")); - log.info("updateOrSaveCourse = " + resp); + log.info("syncCourseStudent = " + resp); + } + + public void syncOnLineScore(ScoreParam param, String token) { + String resp = Optional.ofNullable( + HttpRequest.post(syncOnLineScore).body(JSONUtil.toJsonStr(param)).header("token", token).execute() + .body()).orElseThrow(() -> new RuntimeException("token校验失败")); + log.info("syncOnLineScore = " + resp); } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java index 2b8dd7d0..aaad46a9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java @@ -1,7 +1,10 @@ package com.xboe.module.interaction.api; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import com.xboe.api.ThirdApi; +import com.xboe.module.course.dto.ScoreParam; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -25,18 +28,26 @@ public class CourseGradeApi extends ApiBaseController { @Resource private ICourseGradeService service; + @Resource + private ThirdApi thirdApi; + /** * 评分 * */ @PostMapping("/grade") @AutoLog(module = "评分",action = "评分") - public JsonResponse grade(String courseId,Float score,String studyId){ + public JsonResponse grade(String courseId,Float score,String studyId, HttpServletRequest request){ CourseGrade courseGrade = new CourseGrade(); courseGrade.setCourseId(courseId); courseGrade.setScores(score); courseGrade.setStudyId(studyId); try { Float aFloat = service.save(courseGrade); + String token = request.getHeader("Xboe-Access-Token"); + ScoreParam param = new ScoreParam(); + param.setCourseId(Long.parseLong(courseId)); + param.setScore(token); + thirdApi.syncOnLineScore(param,token); return success(aFloat); }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 df1fc99e..d6b61683 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -79,3 +79,4 @@ userBasic.getUserBasicInfo=${boe.domain}/userbasic/user/getUserBasicInfo #讲师管理创建或修改在线课授课记录 coursesuilt.updateOrSaveCourse=${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse coursesuilt.syncCourseStudent=${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent +coursesuilt.syncOnLineScore=${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore From 0e74f11615b83f00c5fc8ea359a74a143c9c47e5 Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Sun, 3 Nov 2024 17:07:14 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=88=E8=AF=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/course/dto/ScoreParam.java | 9 +++++++++ .../com/xboe/module/interaction/api/CourseGradeApi.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/course/dto/ScoreParam.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/ScoreParam.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/ScoreParam.java new file mode 100644 index 00000000..8efda2cc --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/ScoreParam.java @@ -0,0 +1,9 @@ +package com.xboe.module.course.dto; + +import lombok.Data; + +@Data +public class ScoreParam { + private Long courseId; + private Float score; +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java index aaad46a9..69dbb9be 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CourseGradeApi.java @@ -46,7 +46,7 @@ public class CourseGradeApi extends ApiBaseController { String token = request.getHeader("Xboe-Access-Token"); ScoreParam param = new ScoreParam(); param.setCourseId(Long.parseLong(courseId)); - param.setScore(token); + param.setScore(score); thirdApi.syncOnLineScore(param,token); return success(aFloat); }catch(Exception e) { From f5c26d02d1fcbb02edcfc60de9fc9974f8743ad1 Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Sat, 9 Nov 2024 16:51:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E8=AF=BE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/api/ThirdApi.java | 9 +++++++++ .../com/xboe/module/course/api/CourseAuditApi.java | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) 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 f6fc0739..9d3cf705 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 @@ -80,6 +80,9 @@ public class ThirdApi { private String syncCourseStudent; @Value("${coursesuilt.syncOnLineScore}") private String syncOnLineScore; + @Value("${coursesuilt.updateOnLineStatua}") + private String updateOnLineStatua; + //获取例外人员的id public List getUserId(){ @@ -331,4 +334,10 @@ public class ThirdApi { .body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("syncOnLineScore = " + resp); } + public void updateOnLineStatua(CourseParam param, String token){ + String resp = Optional.ofNullable( + HttpRequest.post(updateOnLineStatua).body(JSONUtil.toJsonStr(param)).header("token", token).execute() + .body()).orElseThrow(() -> new RuntimeException("token校验失败")); + log.info("updateOrSaveCourse = " + resp); + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java index f3d73716..f0c9b6c1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java @@ -321,7 +321,7 @@ public class CourseAuditApi extends ApiBaseController{ * @return */ @PostMapping("/hrbp-submit-audit") - public JsonResponse hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark){ + public JsonResponse hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark, HttpServletRequest request){ if(StringUtils.isBlank(auditId)){ return badRequest("参数错误"); } @@ -353,6 +353,14 @@ public class CourseAuditApi extends ApiBaseController{ try { CurrentUser cu=getCurrent(); service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark); + + if (pass){ + //修改在线课开课状态=已开课 + String token = request.getHeader("Xboe-Access-Token"); + CourseParam param = new CourseParam(); + param.setId(courseId); + thirdApi.updateOnLineStatua(param,token); + } return success(true); } catch (Exception e) { log.error("HRBP审核提交处理错误",e); From e0d731e296d201af1a79bcfc270af62b8e145afc Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Sat, 9 Nov 2024 16:52:07 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E8=AF=BE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index d6b61683..4f0fac87 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -80,3 +80,4 @@ userBasic.getUserBasicInfo=${boe.domain}/userbasic/user/getUserBasicInfo coursesuilt.updateOrSaveCourse=${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse coursesuilt.syncCourseStudent=${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent coursesuilt.syncOnLineScore=${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore +coursesuilt.updateOnLineStatua=${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua From 3f59552c2e4d58781cd789005a266cb304d58ebe Mon Sep 17 00:00:00 2001 From: Wangxxz <980548574@qq.com> Date: Sat, 16 Nov 2024 10:21:12 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boe-server-all/src/main/java/com/xboe/api/ThirdApi.java | 1 + .../main/java/com/xboe/module/course/api/CourseAuditApi.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 9d3cf705..e2f7527c 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 @@ -316,6 +316,7 @@ public class ThirdApi { } public void updateOrSaveCourse(CourseParam param, String token){ + log.info("---------------准备同步在线课到讲师管理完毕 ------- param " + param); String resp = Optional.ofNullable( HttpRequest.post(updateOrSaveCourse).body(JSONUtil.toJsonStr(param)).header("token", token).execute() .body()).orElseThrow(() -> new RuntimeException("token校验失败")); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java index f0c9b6c1..8d68b26a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java @@ -393,6 +393,7 @@ public class CourseAuditApi extends ApiBaseController{ @PostMapping("/submit-publish") @AutoLog(module = "课程",action = "默认管理员提交发布",info = "") public JsonResponse submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){ + log.info("---------------提交并直接发布，用于默认管理直接操作 -------"); if(dto.getCourse()==null){ return badRequest("无课程信息"); } @@ -423,13 +424,15 @@ public class CourseAuditApi extends ApiBaseController{ dto.getCourse().setEnabled(true);//设置启用状态问题 dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态 try { - courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName()); + courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName()); + log.info("---------------在线课开始同步到讲师管理 ------- token = " + token); CourseParam param = new CourseParam(); param.setId(dto.getCourse().getId()); param.setOrgId(dto.getCourse().getOrgId()); param.setOrgName(dto.getCourse().getOrgName()); thirdApi.updateOrSaveCourse(param,token); + log.info("---------------在线课同步到讲师管理完毕 -------"); return success(true); } catch (Exception e) { log.error("默认管理员提交直接发布处理失败",e);