diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java index ad2a3550..f69ed0f1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/PhpOnlineStudyRecordScheduledTasks.java @@ -21,10 +21,12 @@ 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.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; @@ -42,97 +44,109 @@ public class PhpOnlineStudyRecordScheduledTasks { @Resource RestHighLevelClient restHighLevelClient; + @Value("${spring.profiles.active}") + private String activeProfile; // todo 定时、分批、数据库名 - @XxlJob("phpOnlineStudyRecordSyncEs") - public void phpOnlineStudyRecordSyncEs(Long syncTimePoint) throws IOException { + @XxlJob("phpOnlineStudyRecordSyncEsTask") + public List phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) 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"; + " elc.kid AS courseId,\n" + + " elcr.user_id AS userIdOfPhp,\n" + + " ROUND((SUM(CASE WHEN elrc.kid IS NOT NULL THEN 1 ELSE 0 END) / COUNT(1)) * 100, 0) AS progress\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 AND updated_at < ?2\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"; + log.info("开始同步PHP学习记录到ES"); // 增量获取PHP中所有已完成的课程 - if (syncTimePoint == null) { - LocalDateTime halfAnHourAgo = LocalDateTime.now().minusMinutes(30); - syncTimePoint = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond(); + if (syncTimePointOfBegin == null || syncTimePointOfEnd == null) { + LocalDateTime now = LocalDateTime.now(); + LocalDateTime halfAnHourAgo = now.minusMinutes(30); + syncTimePointOfBegin = halfAnHourAgo.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond(); + syncTimePointOfEnd = now.atZone(ZoneId.systemDefault()).toInstant().getEpochSecond(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - log.info("同步时间点：{}", formatter.format(halfAnHourAgo)); + log.info("同步时间起点：{}", formatter.format(halfAnHourAgo)); + log.info("同步时间终点：{}", formatter.format(now)); } - List objectList1 = phpOnlineCourseDao.sqlFindList(sql, syncTimePoint); - - + List objectList1 = phpOnlineCourseDao.sqlFindList(sql, syncTimePointOfBegin,syncTimePointOfEnd); if (CollUtil.isEmpty(objectList1)) { log.info("没有找到已完成的数据"); - return; + return null; } String indexName = "new_study_resource"; - List finishedCourseList = new ArrayList<>(); + List recentLearnRecordList = new ArrayList<>(); for (Object[] objects : objectList1) { String courseId = objects[0].toString(); String userIdOfPhp = objects[1].toString(); + Integer progress = ((BigDecimal) objects[2]).intValue(); PhpOnlineDto phpOnlineDto = new PhpOnlineDto(); phpOnlineDto.setCourseId(courseId); phpOnlineDto.setUserIdOfPhp(userIdOfPhp); - finishedCourseList.add(phpOnlineDto); + phpOnlineDto.setProgress(progress); + recentLearnRecordList.add(phpOnlineDto); } // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题 + + String userBasicDataBase; + if (activeProfile.equals("prod")) { + userBasicDataBase = "user_basic"; + } else { + userBasicDataBase = "userbasic"; + } + List userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList()); - List objectList2 = phpOnlineCourseDao.sqlFindList("select kid,user_id from userbasic.user_account where kid in (?1) and deleted=0 and account_status = 0", userIds); + List objectList2 = phpOnlineCourseDao.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIds); if (CollUtil.isEmpty(objectList1)) { log.info("新系统用户数据不存在"); - return; + return null; } Map userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1])); // 设置新系统用户ID - finishedCourseList = finishedCourseList.stream() + recentLearnRecordList = recentLearnRecordList.stream() .map(phpOnlineDto -> { Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp()); if (userIdOfJavaObj != null) { @@ -144,28 +158,44 @@ public class PhpOnlineStudyRecordScheduledTasks { .collect(Collectors.toList()); - // 获取ES中没有完成的的课程学习记录 - List notFinishedCourseList = getEsData(finishedCourseList); + // 获取ES中的数据 + List esDataList = getEsData(recentLearnRecordList); + // 构建映射关系 + Map map = recentLearnRecordList.stream() + .collect(Collectors.toMap( + phpOnlineDto -> phpOnlineDto.getUserIdOfJava() + "-" + phpOnlineDto.getCourseId(), + phpOnlineDto -> phpOnlineDto + )); - Set finishedCourseSet = finishedCourseList.stream().map(e -> e.getUserIdOfJava() + "_" + e.getCourseId()).collect(Collectors.toSet()); + List toBeUpdatedEs = esDataList.stream() + .map(esDataItem -> { + String key = esDataItem.getAccountId() + "-" + esDataItem.getCourseId(); + PhpOnlineDto phpOnlineDto = map.get(key); + + // 如果找到相应的 PhpOnlineDto 且进度有变化，则进行更新 + if (phpOnlineDto != null && !esDataItem.getProgress().equals(phpOnlineDto.getProgress())) { + esDataItem.setProgress(phpOnlineDto.getProgress()); + if (phpOnlineDto.getProgress() == 100){ + esDataItem.setStatus(9); + } else { + esDataItem.setStatus(2); + } + return esDataItem; + } + return null; // 返回 null 表示不需要更新 + }) + .filter(Objects::nonNull) // 去掉返回为 null 的项 + .collect(Collectors.toList()); + + + if (isOnlyRead != null && isOnlyRead == 1) { + return toBeUpdatedEs; + } - List 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); - +// toBeUpdatedEs(toBeUpdatedEs, indexName); + return null; } private List getEsData(List finishedCourseList) throws IOException { diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java index 0ad3bab6..40b4f97a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java @@ -44,6 +44,7 @@ public class StudyCourseESApi extends ApiBaseController{ @Resource private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks; + @RequestMapping(value="/search",method = {RequestMethod.GET,RequestMethod.POST}) public JsonResponse> search(Pagination page, CourseStudyDto dto){ @@ -169,8 +170,10 @@ public class StudyCourseESApi extends ApiBaseController{ @PostMapping("/phpOnlineStudyRecordSyncEs") - public JsonResponse phpOnlineStudyRecordSyncEs(Long syncTimePoint) throws IOException { - phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePoint); - return success(true); + public JsonResponse> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException { + List courseStudyDtoList = phpOnlineStudyRecordScheduledTasks.phpOnlineStudyRecordSyncEs(syncTimePointOfBegin,syncTimePointOfEnd, isOnlyRead); + return success(courseStudyDtoList); } + + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java index 9d77ca77..2cf9dda9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/PhpOnlineDto.java @@ -25,4 +25,9 @@ public class PhpOnlineDto { * 课程名称 */ private String userIdOfJava; + + /** + * 进度 + */ + private Integer progress; }