mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-07 01:46:47 +08:00
Merge branch 'yx1101-teacher-l' into dev1107
This commit is contained in:
@@ -7,6 +7,8 @@ import javax.annotation.Resource;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.xboe.api.ThirdApi;
|
||||||
|
import com.xboe.module.course.dto.*;
|
||||||
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;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@@ -26,11 +28,6 @@ import com.xboe.data.dto.UserOrgIds;
|
|||||||
import com.xboe.data.outside.IOutSideDataService;
|
import com.xboe.data.outside.IOutSideDataService;
|
||||||
import com.xboe.data.service.IDataUserSyncService;
|
import com.xboe.data.service.IDataUserSyncService;
|
||||||
import com.xboe.module.assistance.service.IEmailService;
|
import com.xboe.module.assistance.service.IEmailService;
|
||||||
import com.xboe.module.course.dto.CourseExportDto;
|
|
||||||
import com.xboe.module.course.dto.CourseFullDto;
|
|
||||||
import com.xboe.module.course.dto.CourseQueryDto;
|
|
||||||
import com.xboe.module.course.dto.CourseTeacherAndCourse;
|
|
||||||
import com.xboe.module.course.dto.CourseTeacherExportDto;
|
|
||||||
import com.xboe.module.course.entity.Course;
|
import com.xboe.module.course.entity.Course;
|
||||||
import com.xboe.module.course.entity.CourseContent;
|
import com.xboe.module.course.entity.CourseContent;
|
||||||
import com.xboe.module.course.entity.CourseCrowd;
|
import com.xboe.module.course.entity.CourseCrowd;
|
||||||
@@ -100,7 +97,8 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
IDataUserSyncService userSyncService;
|
IDataUserSyncService userSyncService;
|
||||||
|
@Resource
|
||||||
|
private ThirdApi thirdApi;
|
||||||
|
|
||||||
// @PostMapping("/test")
|
// @PostMapping("/test")
|
||||||
// public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
|
// public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
|
||||||
@@ -271,7 +269,7 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
*/
|
*/
|
||||||
@PostMapping("/save")
|
@PostMapping("/save")
|
||||||
@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
|
@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
|
||||||
public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto){
|
public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
|
||||||
if(dto.getCourse()==null){
|
if(dto.getCourse()==null){
|
||||||
return badRequest("无课程信息");
|
return badRequest("无课程信息");
|
||||||
}
|
}
|
||||||
@@ -302,7 +300,14 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
dto.getCourse().setStatus(Course.STATUS_NONE);
|
dto.getCourse().setStatus(Course.STATUS_NONE);
|
||||||
courseService.update(dto);
|
courseService.update(dto);
|
||||||
}
|
}
|
||||||
|
String token = request.getHeader("Xboe-Access-Token");
|
||||||
|
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(dto);
|
return success(dto);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("整体保存课程信息错误",e);
|
log.error("整体保存课程信息错误",e);
|
||||||
|
|||||||
Reference in New Issue
Block a user