修改方法名称

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -5,6 +5,8 @@ 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.dto.ScoreParam;
 import com.xboe.module.course.vo.StudyCourseVo;
 import com.xboe.module.course.vo.TeacherInfoVo;
 import com.xboe.module.course.vo.TeacherVo;
@@ -72,6 +74,16 @@ public class ThirdApi {
     @Value("${userBasic.getUserBasicInfo}")
     private String getUserBasicInfo;
 
+    @Value("${coursesuilt.updateOrSaveCourse}")
+    private String updateOrSaveCourse;
+    @Value("${coursesuilt.syncCourseStudent}")
+    private String syncCourseStudent;
+    @Value("${coursesuilt.syncOnLineScore}")
+    private String syncOnLineScore;
+    @Value("${coursesuilt.updateOnLineStatus}")
+    private String updateOnLineStatus;
+
+
     //获取例外人员的id
     public  List<String> getUserId(){
         String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316
@@ -302,4 +314,31 @@ public class ThirdApi {
         return basicInfos;
 
     }
+
+    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校验失败"));
+        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("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);
+    }
+    public void updateOnLineStatus(CourseParam param, String token){
+        String resp = Optional.ofNullable(
+                HttpRequest.post(updateOnLineStatus).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
+        log.info("updateOrSaveCourse = " + resp);
+    }
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseAuditApi.java

@@ -5,7 +5,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 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;
@@ -55,7 +58,10 @@ public class CourseAuditApi  extends ApiBaseController{
 	
 	@Resource
 	private ICourseContentService ccontentService;
-	
+	@Resource
+	private ThirdApi thirdApi;
+
+
 	/**
 	 * 教师需要审核的课程
 	 * @param pager
@@ -315,7 +321,7 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/hrbp-submit-audit")
-	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark){
+	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(auditId)){
 			return badRequest("参数错误");
 		}
@@ -347,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.updateOnLineStatus(param,token);
+			}
 			return success(true);
 		} catch (Exception e) {
 			log.error("HRBP审核提交处理错误",e);
@@ -378,7 +392,8 @@ public class CourseAuditApi  extends ApiBaseController{
 	 */
 	@PostMapping("/submit-publish")
 	@AutoLog(module = "课程",action = "默认管理员提交发布",info = "")
-	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto){
+	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){
+		log.info("---------------提交并直接发布，用于默认管理直接操作 -------");
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -402,12 +417,22 @@ 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());
+			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);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java

@@ -7,6 +7,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.xboe.api.ThirdApi;
+import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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.service.IDataUserSyncService;
 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.CourseContent;
 import com.xboe.module.course.entity.CourseCrowd;
@@ -100,7 +97,8 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Autowired
     IDataUserSyncService userSyncService;
-	
+	@Resource
+	private ThirdApi thirdApi;
 	
 //	@PostMapping("/test")
 //	public JsonResponse<PageList<Course>> findTest(Pagination pager,CourseQueryDto dto){
@@ -271,7 +269,7 @@ public class CourseManageApi extends ApiBaseController{
 	 */
 	@PostMapping("/save")
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
-	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto){
+	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
 		if(dto.getCourse()==null){
 			return badRequest("无课程信息");
 		}
@@ -302,7 +300,14 @@ public class CourseManageApi extends ApiBaseController{
 				dto.getCourse().setStatus(Course.STATUS_NONE);
 				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);
 		} catch (Exception e) {
 			log.error("整体保存课程信息错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

@@ -11,7 +11,6 @@ import com.xboe.core.orm.FieldFilters;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.dto.TeacherCourseDto;
 import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseContentService;
 import com.xboe.module.course.service.ICourseSectionService;
@@ -29,8 +28,6 @@ import com.xboe.school.study.entity.StudyHomeWork;
 import com.xboe.school.study.service.IStudyCourseService;
 import com.xboe.school.study.service.IStudyHomeWorkService;
 import com.xboe.school.study.service.IStudyService;
-import com.xboe.system.user.entity.User;
-import com.xboe.system.user.service.IUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,8 +60,7 @@ public class CoursePortalApi extends ApiBaseController{
 
 	@Resource
 	private ICourseService courseService;
-	@Resource
-	private IUserService userService;
+
 	@Resource
 	private ITeacherService teacherService;
 
@@ -282,7 +278,7 @@ public class CoursePortalApi extends ApiBaseController{
 		if (!Objects.isNull(studyCourse)){
 			pass = true;
 		}
-		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty() && !StringUtils.isEmpty(audiences)) {
+		if (Objects.isNull(studyCourse) && !courseCrowdList.isEmpty()) {
 			List<String> audienceList = Arrays.asList(audiences.split(",")); // 此用户所在受众组
 			log.error("---------------参数------------ audienceList = " + audienceList);
 			for (CourseCrowd c : courseCrowdList) {
@@ -305,30 +301,17 @@ public class CoursePortalApi extends ApiBaseController{
 		List<CourseContent> cclist=contentService.getByCourseId(id);
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
-		List<TeacherCourseDto> teacherCourseDtos = new ArrayList<>();
+
 
 		//获取教师的介绍信息,因为一门课程 的教师不会太多，所以这里简单直接遍历查询，后续再优化
 		for(CourseTeacher ct : teachers) {
-			TeacherCourseDto teacherCourseDto = new TeacherCourseDto();
 			Teacher t = teacherService.get(ct.getTeacherId());
-			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
 					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
-					teacherCourseDto.setCourseId(ct.getCourseId());
-					teacherCourseDto.setTeacherName(ct.getTeacherName());
-					teacherCourseDto.setTeacherId(ct.getTeacherId());
-					teacherCourseDto.setCode(ct.getCode());
-					teacherCourseDto.setRemark(ct.getRemark());
-					teacherCourseDto.setSysCreateAid(ct.getSysCreateAid());
-					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
-					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
-					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
-					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
@@ -336,17 +319,6 @@ public class CoursePortalApi extends ApiBaseController{
 					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
-					teacherCourseDto.setCourseId(ct.getCourseId());
-					teacherCourseDto.setTeacherName(ct.getTeacherName());
-					teacherCourseDto.setTeacherId(ct.getTeacherId());
-					teacherCourseDto.setCode(ct.getCode());
-					teacherCourseDto.setRemark(ct.getRemark());
-					teacherCourseDto.setSysCreateAid(ct.getSysCreateAid());
-					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
-					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
-					teacherCourseDto.setId(ct.getId());
-					teacherCourseDto.setUserNo(user.getUserNo());
-					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}
 
@@ -355,7 +327,7 @@ public class CoursePortalApi extends ApiBaseController{
 		rs.put("isCrowd",pass);
 		rs.put("contents",	cclist);
 		rs.put("sections",sectionlist);
-		rs.put("teachers",teacherCourseDtos);
+		rs.put("teachers",teachers);
 		//查询课程
 		return success(rs);
 

servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseFileDao.java

@@ -10,8 +10,6 @@ import com.xboe.core.orm.BaseDao;
 import com.xboe.core.orm.IFieldFilter;
 import com.xboe.module.course.entity.CourseFile;
 
-import javax.transaction.Transactional;
-
 
 @Repository
 public class CourseFileDao extends BaseDao<CourseFile> {
@@ -23,5 +21,4 @@ public class CourseFileDao extends BaseDao<CourseFile> {
         PageList<CourseFile> page = this.getGenericDao().findPage(pageIndex, pageSize, getEntityClass(), filters,order);
         return page;
     }
-
 }

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;
+}

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;
+}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/TeacherCourseDto.java

@@ -1,11 +0,0 @@
-package com.xboe.module.course.dto;
-
-import com.xboe.module.course.entity.CourseTeacher;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class TeacherCourseDto extends CourseTeacher {
-    private String userNo;
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseFileService.java

@@ -54,6 +54,4 @@ public interface ICourseFileService {
      * @param deleted
      */
     void delete(String id,boolean deleted);
-
-//    void updateDuration(String contentRefId, Integer duration);
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.xboe.common.OrderCondition;
-import com.xboe.common.PageList;
 import com.xboe.core.cache.IXaskCache;
 import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.orm.FieldFilters;
@@ -15,9 +14,11 @@ import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.CourseContentDto;
 import com.xboe.module.course.dto.SortItem;
-import com.xboe.module.course.entity.*;
+import com.xboe.module.course.entity.CourseAssess;
+import com.xboe.module.course.entity.CourseContent;
+import com.xboe.module.course.entity.CourseExam;
+import com.xboe.module.course.entity.CourseHomeWork;
 import com.xboe.module.course.service.ICourseContentService;
-import com.xboe.module.course.service.ICourseFileService;
 import com.xboe.module.exam.dao.ExamPaperDao;
 import com.xboe.module.exam.vo.TestQuestionVo;
 import com.xboe.standard.enums.BoedxContentType;
@@ -56,8 +57,7 @@ public class CourseContentServiceImpl implements ICourseContentService {
 
     @Resource
     private ExamPaperDao examPaperDao;
-	@Resource
-	private ICourseFileService courseFileService;
+
 
 	@Override
 	@Transactional
@@ -83,7 +83,6 @@ public class CourseContentServiceImpl implements ICourseContentService {
 			ccDao.save(cc);
 		}else {
 			ccDao.update(cc);
-//			courseFileService.updateDuration(cc.getContentRefId(),cc.getDuration());
 			cc.setSysVersion(ccDao.getVersion(cc.getId()));
 		}
 		//添加或保存其它信息

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseFileServiceImpl.java

@@ -98,14 +98,4 @@ public class CourseFileServiceImpl implements ICourseFileService {
 	public CourseFile get(String id) {
 		return courseFileDao.get(id);
 	}
-
-
-//	@Override
-//	public void updateDuration(String contentRefId,Integer duration) {
-//		if (duration == null) {
-//			duration = 0;
-//		}
-//		String sql = "UPDATE boe_course_file SET duration = "+ duration+" WHERE id = "+ contentRefId+" ";
-//		courseFileDao.sqlUpdate(sql);
-//	}
 }

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,27 @@ public class CourseGradeApi extends ApiBaseController {
 
     @Resource
     private ICourseGradeService service;
+    @Resource
+    private ThirdApi thirdApi;
+
     /**
      * 评分
      * */
     @PostMapping("/grade")
     @AutoLog(module = "评分",action = "评分")
-    public JsonResponse<Float> grade(String courseId,Float score,String studyId){
+    public JsonResponse<Float> 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(score);
+            // 同步在线课评分
+//            thirdApi.syncOnLineScore(param,token);
 	        return success(aFloat);
         }catch(Exception e) {
         	log.error("评分保存错误",e);

servers/boe-server-all/src/main/java/com/xboe/module/teacher/entity/Teacher.java

@@ -1,6 +1,8 @@
 package com.xboe.module.teacher.entity;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -153,7 +155,7 @@ public class Teacher extends BaseEntity {
      */
     @Column(name = "courses")
     private String courses;
-    
+
     /**
      * 发薪地id
      */
@@ -206,4 +208,56 @@ public class Teacher extends BaseEntity {
     @Column(name = "expertise")
     private String expertise;
 
+    @Column(name = "user_no",length = 1)
+    private String userNo;
+
+//    @ApiModelProperty(value = "讲师类型 1 内部讲师  2外部讲师")
+    @Column(name = "teacher_type")
+    private Integer teacherType;
+
+//    @ApiModelProperty(value = "默认授课时长(分钟)")
+    @Column(name = "default_teaching_time")
+    private Integer defaultTeachingTime;
+
+//    @ApiModelProperty(value = "认证人")
+    @Column(name = "certify_by")
+    private String certifyBy;
+
+//    @ApiModelProperty(value = "认证时间")
+    @Column(name = "certify_at")
+    private LocalDateTime certifyAt;
+
+    //    @ApiModelProperty(value = "认证资料路径")
+    @Column(name = "certification")
+    private String certification;
+
+    //   @ApiModelProperty(value = "认证资料路径名称")
+    @Column(name = "certification_name")
+    private String certificationName;
+
+    //    @ApiModelProperty(value = "供应商")
+    @Column(name = "supplier")
+    private String supplier;
+
+
+    //   @ApiModelProperty(value = "教师专长名称 逗号分割")
+    @Column(name = "expertise_names")
+    private String expertiseNames;
+
+    //   @ApiModelProperty(value = "标识 0：自动录入/1：手动录入")
+    @Column(name = "create_from")
+    private Integer createFrom;
+
+    //    @ApiModelProperty(value = "组织id")
+    @Column(name = "org_id")
+    private Long orgId;
+
+    //     @ApiModelProperty(value = "组织名称")
+    @Column(name = "org_name")
+    private String orgName;
+
+    //    @ApiModelProperty(value = "旧系统kid字段")
+    @Column(name = "kid")
+    private String kid;
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/teacher/service/impl/TeacherServiceImpl.java

@@ -102,9 +102,12 @@ public class TeacherServiceImpl implements ITeacherService {
     public List<Teacher> findByName(String name) {
     	String hql="Select t.id,t.name,u.userNo from "+Teacher.class.getSimpleName()+" t,"+User.class.getSimpleName()+" u ";
     	hql+=" where t.id=u.id and (t.name like '%"+name+"%' or u.userNo=?1)";
+//        String hql="Select t.id,t.name,t.userNo from "+Teacher.class.getSimpleName()+" t";
+//        hql+=" where t.deleted =0 and t.status =1 and (t.name like '%"+name+"%' or t.userNo like '%"+name+"%' )";
+
     	List<Teacher> teachers=new ArrayList<Teacher>();
     	try {
-			List<Object[]> list =dao.findListFields(hql,name);
+			List<Object[]> list =dao.findListFields(hql);
 			for(Object[] objs :list) {
 				Teacher t=new Teacher();
 				t.setId((String)objs[0]);

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

@@ -228,7 +228,7 @@ public class StudyCourseApi extends ApiBaseController{
 		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
-		if(pass==true && sc==null) {
+		if(sc==null) {
 			//未报名，这里直接报名
 			StudySignup signup=new StudySignup();
 			signup.setCourseId(cid);
@@ -246,13 +246,13 @@ public class StudyCourseApi extends ApiBaseController{
 			signup.setSignTime(LocalDateTime.now());
 			sc=service.autoSignup(signup);
 		}
-		if (sc !=null){
-			rs.put("studyId", sc.getId());//学习id
-			rs.put("progress", sc.getProgress());
-			//查询上次学习的是什么资源。查询用户的学习情况
-			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
-			rs.put("contentStudys",items);//学习的内容
-		}
+		
+		rs.put("signup",true);
+		rs.put("studyId", sc.getId());//学习id
+		rs.put("progress", sc.getProgress());
+		//查询上次学习的是什么资源。查询用户的学习情况
+		List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
+		rs.put("contentStudys",items);//学习的内容
 		
 		return success(rs);
 	}
@@ -750,18 +750,26 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @param courseId 课程id 用于删除课程报名信息和修改课程学习人数
 	 * */
 	@PostMapping("/delete-signup")
-	public JsonResponse<Boolean> deleteSignUp(String id,String courseId,String studentId){
+	public JsonResponse<Boolean> 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);
+
 	}
 
 	/**

servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java

@@ -1,6 +1,9 @@
 package com.xboe.system.api;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -11,11 +14,6 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xboe.core.SysConstant;
-import com.xboe.standard.BaseConstant;
-import com.xboe.system.assist.entity.XUploadResultDto;
-import it.sauronsoftware.jave.Encoder;
-import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -117,23 +115,8 @@ public class SysUploaderApi  extends ApiBaseController{
 //				ex.printStackTrace();
 				log.error("处理失败",ex);
 			}
-			Long ls = 0L;
-			XUploadResultDto dto=new XUploadResultDto();
-			String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
-			try {
-				Encoder encoder = new Encoder();
-				MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
-				ls = m.getDuration() / 1000;//秒
-			}catch (Exception e){
-				e.printStackTrace();
-				log.error("读取视频时长错误");
-			}
-			dto.setDuration(ls);
-			dto.setDisplayName(xur.getDisplayName());
-			dto.setFilePath(xur.getFilePath());
-			dto.setFileType(xur.getFileType());
-			dto.setHttpPath(xur.getHttpPath());
-			return wrap(dto);
+			
+			return wrap(xur);
 
 		} catch (Exception e) {
 			log.error("upload file error ",e);

servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java

@@ -1,9 +0,0 @@
-package com.xboe.system.assist.entity;
-
-import com.xboe.core.upload.XUploadResult;
-import lombok.Data;
-
-@Data
-public class XUploadResultDto extends XUploadResult {
-    private Long duration;
-}

servers/boe-server-all/src/main/resources/application.properties

@@ -76,3 +76,8 @@ 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
+coursesuilt.syncCourseStudent=${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
+coursesuilt.syncOnLineScore=${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
+coursesuilt.updateOnLineStatus=${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatus