es数据同步-在线课

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.updateOnLineStatua}")
+    private String updateOnLineStatua;
+
+
     //获取例外人员的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 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);
+    }
 }

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.updateOnLineStatua(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/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/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<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/PhpOnlineStudyRecordScheduledTasks.java

@@ -0,0 +1,245 @@
+package com.xboe.school.study.api;
+
+import cn.hutool.core.collection.CollUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.xboe.module.course.dto.CourseStudyDto;
+import com.xboe.school.study.dao.PhpOnlineCourseDao;
+import com.xboe.school.study.dto.PhpOnlineDto;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class PhpOnlineStudyRecordScheduledTasks {
+
+    @Resource
+    private PhpOnlineCourseDao phpOnlineCourseDao;
+
+    @Resource
+    RestHighLevelClient restHighLevelClient;
+
+
+    // todo 定时、分批、数据库名
+    @XxlJob("phpOnlineStudyRecordSyncEs")
+    public void phpOnlineStudyRecordSyncEs(Long syncTimePoint) throws IOException {
+        String sql =
+                "SELECT\n" +
+                "  elc.kid AS courseId,\n" +
+                "  elcr.user_id AS userIdOfPhp,\n" +
+                "  COUNT(1) AS modNum,\n" +
+                "  SUM(CASE WHEN elrc.kid IS NOT NULL THEN 1 ELSE 0 END) AS completeNum\n" +
+                "FROM\n" +
+                "  elearninglms.eln_ln_course elc\n" +
+                "  INNER JOIN elearninglms.eln_ln_course_reg elcr \n" +
+                "    ON elc.kid = elcr.course_id\n" +
+                "  INNER JOIN (\n" +
+                "    SELECT\n" +
+                "      user_id,\n" +
+                "      course_id \n" +
+                "    FROM\n" +
+                "      elearninglms.eln_ln_res_complete\n" +
+                "    WHERE\n" +
+                "      complete_type = '1'\n" +
+                "      AND complete_status = '2'\n" +
+                "      AND updated_at > ?1\n" +
+                "      AND is_deleted = 0\n" +
+                "    GROUP BY\n" +
+                "      user_id,\n" +
+                "      course_id\n" +
+                "  ) recentFinishStuent \n" +
+                "    ON recentFinishStuent.user_id = elcr.user_id \n" +
+                "    AND recentFinishStuent.course_id = elcr.course_id\n" +
+                "  INNER JOIN elearninglms.eln_ln_mod_res elms \n" +
+                "    ON elms.course_id = elcr.course_id\n" +
+                "  LEFT JOIN elearninglms.eln_ln_res_complete elrc \n" +
+                "    ON elrc.mod_res_id = elms.kid\n" +
+                "    AND elrc.user_id = elcr.user_id\n" +
+                "    AND elrc.complete_type = '1'\n" +
+                "    AND elrc.complete_status = '2'\n" +
+                "WHERE\n" +
+                "  elc.is_deleted = 0\n" +
+                "  AND elcr.is_deleted = 0\n" +
+                "  AND elcr.reg_state = '1'\n" +
+                "  AND elms.publish_status = '1'\n" +
+                "  AND elms.is_deleted = '0'\n" +
+                "GROUP BY\n" +
+                "  elc.kid,\n" +
+                "  elcr.user_id\n" +
+                "HAVING\n" +
+                "  completeNum = modNum\n";
+        log.info("开始同步PHP学习记录到ES");
+        // 增量获取PHP中所有已完成的课程
+        if (syncTimePoint == null) {
+            LocalDateTime halfAnHourAgo = LocalDateTime.now().minusMinutes(30);
+            syncTimePoint = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            log.info("同步时间点：{}", formatter.format(halfAnHourAgo));
+        }
+        List<Object[]> objectList1 = phpOnlineCourseDao.sqlFindList(sql, syncTimePoint);
+
+
+
+        if (CollUtil.isEmpty(objectList1)) {
+            log.info("没有找到已完成的数据");
+            return;
+        }
+
+        String indexName = "new_study_resource";
+
+        List<PhpOnlineDto> finishedCourseList = new ArrayList<>();
+        for (Object[] objects : objectList1) {
+            String courseId = objects[0].toString();
+            String userIdOfPhp = objects[1].toString();
+            PhpOnlineDto phpOnlineDto = new PhpOnlineDto();
+            phpOnlineDto.setCourseId(courseId);
+            phpOnlineDto.setUserIdOfPhp(userIdOfPhp);
+            finishedCourseList.add(phpOnlineDto);
+        }
+
+        // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
+        List<String> userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
+        List<Object[]> objectList2 = phpOnlineCourseDao.sqlFindList("select kid,user_id from userbasic.user_account where kid in (?1) and deleted=0 and account_status = 0", userIds);
+
+        if (CollUtil.isEmpty(objectList1)) {
+            log.info("新系统用户数据不存在");
+            return;
+        }
+
+        Map<Object, Object> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
+
+        // 设置新系统用户ID
+        finishedCourseList = finishedCourseList.stream()
+                .map(phpOnlineDto -> {
+                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
+                    if (userIdOfJavaObj != null) {
+                        phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
+                    }
+                    return phpOnlineDto;
+                })
+                .filter(phpOnlineDto -> phpOnlineDto.getUserIdOfJava() != null)
+                .collect(Collectors.toList());
+
+
+        // 获取ES中没有完成的的课程学习记录
+        List<CourseStudyDto> notFinishedCourseList = getEsData(finishedCourseList);
+
+        Set<String> finishedCourseSet = finishedCourseList.stream().map(e -> e.getUserIdOfJava() + "_" + e.getCourseId()).collect(Collectors.toSet());
+
+        List<CourseStudyDto> toBeUpdatedEs = notFinishedCourseList.stream().filter(courseStudyDto -> {
+            if (finishedCourseSet.contains(courseStudyDto.getAccountId() + "_" + courseStudyDto.getCourseId())) {
+                return true;
+            } else {
+                // 有多种情况，es不存在学习记录，或者学习记录状态不是9
+                log.info("跳过:{}", courseStudyDto);
+                return false;
+            }
+        }).map(courseStudyDto -> {
+            courseStudyDto.setStatus(9);
+            courseStudyDto.setProgress(100);
+            return courseStudyDto;
+        }).collect(Collectors.toList());
+
+        // 更新ES中的未同步为完成的学习记录
+        toBeUpdatedEs(toBeUpdatedEs, indexName);
+
+    }
+
+    private List<CourseStudyDto> getEsData(List<PhpOnlineDto> finishedCourseList) throws IOException {
+        SearchRequest searchRequest = new SearchRequest("new_study_resource");
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+
+        for (PhpOnlineDto phpOnlineDto : finishedCourseList) {
+            if (phpOnlineDto.getUserIdOfJava() == null || phpOnlineDto.getCourseId() == null) {
+                continue;
+            }
+
+            boolQuery.should(QueryBuilders.boolQuery()
+                    .must(QueryBuilders.termQuery("courseId.keyword", phpOnlineDto.getCourseId()))
+                    .must(QueryBuilders.termQuery("accountId.keyword", phpOnlineDto.getUserIdOfJava()))
+                    .mustNot(QueryBuilders.termQuery("status", 9))
+            );
+        }
+
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(boolQuery).timeout(new TimeValue(60, TimeUnit.SECONDS));
+        searchRequest.source(sourceBuilder);
+        if (boolQuery.hasClauses()) {
+            sourceBuilder.query(boolQuery);
+        }
+        searchRequest.source(sourceBuilder);
+
+        SearchResponse response = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
+        SearchHits hits = response.getHits();
+
+        List<CourseStudyDto> courseStudyDtoList = new ArrayList<>();
+        ObjectMapper mapper = new ObjectMapper();
+        for (SearchHit hit : hits) {
+            String sourceAsString = hit.getSourceAsString();
+            try {
+                CourseStudyDto cft = mapper.readValue(sourceAsString, CourseStudyDto.class);
+                courseStudyDtoList.add(cft);
+            } catch (Exception e) {
+                log.error("转化json到对应失败", sourceAsString);
+            }
+        }
+        return courseStudyDtoList;
+    }
+
+    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData, String indexName) {
+        if (CollUtil.isEmpty(toBeUpdatedEsData)) {
+            return;
+        }
+        BulkRequest bulkRequest = new BulkRequest();
+        for (CourseStudyDto courseStudyDto : toBeUpdatedEsData) {
+            Map<String, Object> docMap = new HashMap<>();
+            docMap.put("status", courseStudyDto.getStatus());
+            docMap.put("progress", courseStudyDto.getProgress());
+
+            // 创建更新请求，并传入单一的docMap
+            UpdateRequest updateRequest = new UpdateRequest(indexName, courseStudyDto.getId())
+                    .doc(docMap, XContentType.JSON);
+
+            // 将请求添加到批量请求中
+            bulkRequest.add(updateRequest);
+        }
+
+        try {
+            // 执行批量更新操作
+            BulkResponse bulkResponse = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT);
+            // 检查是否有失败的操作
+            if (bulkResponse.hasFailures()) {
+                log.error("批量更新失败: {}", bulkResponse.buildFailureMessage());
+            } else {
+                List<String> collect = toBeUpdatedEsData.stream().map(CourseStudyDto::getId).collect(Collectors.toList());
+                log.info("批量更新成功，更新的ES ID列表: {}", collect);
+            }
+        } catch (IOException e) {
+            log.error("执行批量更新时发生错误", e);
+        }
+    }
+
+
+}

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<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/school/study/api/StudyCourseESApi.java

@@ -24,6 +24,8 @@ import com.xboe.school.study.service.IStudyCourseService;
 
 import lombok.extern.slf4j.Slf4j;
 
+import javax.annotation.Resource;
+
 /**
  * ES的课程检索
  * @author seastar
@@ -39,6 +41,9 @@ public class StudyCourseESApi extends ApiBaseController{
 	
 	@Autowired
 	IStudyCourseService service;
+
+	@Resource
+	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
 	
 	@RequestMapping(value="/search",method = {RequestMethod.GET,RequestMethod.POST})
 	public JsonResponse<PageList<CourseStudyDto>> search(Pagination page, CourseStudyDto dto){
@@ -161,4 +166,11 @@ public class StudyCourseESApi extends ApiBaseController{
 		
 		return success(true);
 	}
+
+
+	@PostMapping("/phpOnlineStudyRecordSyncEs")
+	public JsonResponse<Boolean> phpOnlineStudyRecordSyncEs(Long syncTimePoint) throws IOException {
+		phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePoint);
+		return success(true);
+	}
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/dao/PhpOnlineCourseDao.java

@@ -0,0 +1,9 @@
+package com.xboe.school.study.dao;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.school.study.dto.PhpOnlineDto;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
+}

servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java

@@ -0,0 +1,28 @@
+package com.xboe.school.study.dto;
+
+import lombok.Data;
+
+/**
+ * 批量报名
+ *
+ * @author seastar
+ */
+@Data
+public class PhpOnlineDto {
+
+    /**
+     * 课程id
+     */
+    private String courseId;
+
+    /**
+     * 课程名称
+     */
+    private String userIdOfPhp;
+
+
+    /**
+     * 课程名称
+     */
+    private String userIdOfJava;
+}

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.updateOnLineStatua=${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua