Compare commits
4 Commits
1d20e095f7
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| d339af7315 | |||
| 0119b5bb87 | |||
| c97b523bc1 | |||
| aea34dc5e4 |
@@ -86,8 +86,6 @@ public class SyncController {
|
||||
|
||||
// 定时任务方法:每10分钟执行一次
|
||||
@Scheduled(cron = "0 */10 * * * ?")
|
||||
@PostMapping("/executeTasks")
|
||||
@Transactional(rollbackOn = Exception.class)
|
||||
public void executeTasks() {
|
||||
log.info("【定时任务】开始执行 - 同步用户->同步任务->处理分数");
|
||||
|
||||
|
||||
@@ -226,10 +226,11 @@
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<!-- 更新最后同步时间 -->
|
||||
<!-- 更新最后同步时间(仅更新最新一条记录) -->
|
||||
<update id="updateLastSyncTime" parameterType="java.util.Date">
|
||||
UPDATE sync_task_log
|
||||
SET sync_time = #{syncTime}
|
||||
WHERE id = (SELECT max_id FROM (SELECT MAX(id) as max_id FROM sync_task_log) t)
|
||||
</update>
|
||||
|
||||
<update id="update" parameterType="cn.wepact.dfm.training.dto.entity.SyncTaskLog">
|
||||
@@ -339,8 +340,8 @@
|
||||
SELECT
|
||||
s.stu_user_id AS stuUserId,
|
||||
s.project_id AS projectId,
|
||||
SUM(CASE WHEN s.task_required = 1 THEN s.task_get_scores ELSE 0 END) AS requiredTotalScores,
|
||||
SUM(CASE WHEN s.task_required = 0 THEN s.task_get_scores ELSE 0 END) AS electiveTotalScores
|
||||
SUM(CASE WHEN s.task_required = 1 THEN IFNULL(s.task_get_scores, 0) ELSE 0 END) AS requiredTotalScores,
|
||||
SUM(CASE WHEN s.task_required = 0 THEN IFNULL(s.task_get_scores, 0) ELSE 0 END) AS electiveTotalScores
|
||||
FROM
|
||||
(SELECT
|
||||
s1.stu_user_id,
|
||||
|
||||
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@Mapper
|
||||
public interface SyncUserInfoLogMapper extends MyBatisBaseMapper<SyncUserInfoLog, Long> {
|
||||
|
||||
@@ -22,4 +23,6 @@ public interface SyncUserInfoLogMapper extends MyBatisBaseMapper<SyncUserInfoLog
|
||||
|
||||
void updateLastSyncTime(Date date);
|
||||
SyncUserInfoLog findUserInfoByStuUserId(@Param("stuUserId") String stuUserId);
|
||||
|
||||
List<SyncUserInfoLog> batchFindUserInfoByStuUserIds(@Param("stuUserIds") List<String> stuUserIds);
|
||||
}
|
||||
|
||||
@@ -150,4 +150,11 @@
|
||||
<select id="findUserInfoByStuUserId" resultMap="UserResultMap">
|
||||
SELECT user_id, username FROM sync_user_info_log WHERE user_id = #{stuUserId}
|
||||
</select>
|
||||
|
||||
<select id="batchFindUserInfoByStuUserIds" resultMap="UserResultMap">
|
||||
SELECT user_id, username FROM sync_user_info_log WHERE user_id IN
|
||||
<foreach collection="stuUserIds" item="stuUserId" open="(" separator="," close=")">
|
||||
#{stuUserId}
|
||||
</foreach>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -22,4 +22,11 @@ public interface TUserMapper extends MyBatisBaseMapper<TUser, Long> {
|
||||
*/
|
||||
|
||||
Long findUserIdByUsername(@Param("username") String username);
|
||||
|
||||
/**
|
||||
* 批量查询用户ID(替代 N+1 循环查询)
|
||||
* @param usernames 用户名列表
|
||||
* @return username -> userId 映射列表
|
||||
*/
|
||||
List<TUser> batchFindUserIdByUsernames(@Param("usernames") List<String> usernames);
|
||||
}
|
||||
|
||||
@@ -190,4 +190,11 @@
|
||||
<select id="findUserIdByUsername" resultType="java.lang.Long">
|
||||
SELECT id FROM t_user WHERE user_no = #{username}
|
||||
</select>
|
||||
|
||||
<select id="batchFindUserIdByUsernames" resultType="cn.wepact.dfm.training.dto.entity.TUser">
|
||||
SELECT id, user_no AS userNo FROM t_user WHERE user_no IN
|
||||
<foreach collection="usernames" item="username" open="(" separator="," close=")">
|
||||
#{username}
|
||||
</foreach>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -102,9 +102,12 @@ public class JobApplicationService {
|
||||
// java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd");
|
||||
// request.setDateStr(sdf.format(new Date()));
|
||||
// 由于变量projectJoinResponse已在前面定义,这里直接使用赋值语句
|
||||
log.info("调用v学苑joinProject接口, 请求参数: {}", JSON.toJSONString(request));
|
||||
ProjectJoinResponse projectJoinResponse = projectJoinService.joinProject(request);
|
||||
log.info("调用v学苑joinProject接口, 响应结果: {}", JSON.toJSONString(projectJoinResponse));
|
||||
// 判断接口返回状态,只有当 code=10000 时才进行插入操作
|
||||
if (!"10000".equals(projectJoinResponse.getCode())) {
|
||||
log.warn("调用v学苑接口失败, code: {}, msg: {}", projectJoinResponse.getCode(), projectJoinResponse.getMsg());
|
||||
return "调用v学苑接口失败";
|
||||
}
|
||||
//获得专业回馈的必须项提示和积分(两年内)
|
||||
|
||||
@@ -138,7 +138,6 @@ public class SyncTaskService {
|
||||
// 获取上次同步的时间点
|
||||
String lastSyncTime = getLastSyncTimeFromDatabase();
|
||||
String searchStartTime;
|
||||
String searchEndTime = getCurrentTime();
|
||||
|
||||
if ("No sync time recorded.".equals(lastSyncTime) || "Error retrieving last sync time.".equals(lastSyncTime)) {
|
||||
// 如果没有同步记录,默认同步最近24小时的数据
|
||||
@@ -146,60 +145,133 @@ public class SyncTaskService {
|
||||
calendar.add(Calendar.HOUR, -24);
|
||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
searchStartTime = dateFormat.format(calendar.getTime());
|
||||
logger.info("【增量同步】无历史记录,使用24小时前作为起始时间: {}", searchStartTime);
|
||||
} else {
|
||||
searchStartTime = lastSyncTime;
|
||||
}
|
||||
|
||||
// 请求数据
|
||||
// 云学堂API限制:时间范围不能超过1天(同一天),需要按天循环拉取
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
SimpleDateFormat dayFmt = new SimpleDateFormat("yyyy-MM-dd");
|
||||
|
||||
try {
|
||||
Date startDate = sdf.parse(searchStartTime);
|
||||
Date endDate = new Date(); // 当前时间
|
||||
|
||||
Calendar calStart = Calendar.getInstance();
|
||||
calStart.setTime(startDate);
|
||||
// 从当天的00:00:00开始,避免跨天问题
|
||||
calStart.set(Calendar.HOUR_OF_DAY, 0);
|
||||
calStart.set(Calendar.MINUTE, 0);
|
||||
calStart.set(Calendar.SECOND, 0);
|
||||
|
||||
Calendar calEnd = Calendar.getInstance();
|
||||
calEnd.setTime(endDate);
|
||||
|
||||
int totalDays = 0;
|
||||
int totalRecords = 0;
|
||||
|
||||
// 按天循环
|
||||
while (calStart.before(calEnd) || sameDay(calStart, calEnd)) {
|
||||
String dayStart = sdf.format(calStart.getTime());
|
||||
|
||||
// 当天的结束时间:23:59:59 或 当前时间(如果是今天)
|
||||
Calendar dayEndCal = (Calendar) calStart.clone();
|
||||
if (sameDay(calStart, calEnd)) {
|
||||
// 今天,用当前时间
|
||||
dayEndCal.setTime(endDate);
|
||||
} else {
|
||||
dayEndCal.set(Calendar.HOUR_OF_DAY, 23);
|
||||
dayEndCal.set(Calendar.MINUTE, 59);
|
||||
dayEndCal.set(Calendar.SECOND, 59);
|
||||
}
|
||||
String dayEnd = sdf.format(dayEndCal.getTime());
|
||||
|
||||
logger.info("【增量同步】第{}天: {} ~ {}", totalDays + 1, dayStart, dayEnd);
|
||||
|
||||
// 当天内分页拉取
|
||||
int dayOffset = offset;
|
||||
int dayRecords = 0;
|
||||
while (true) {
|
||||
Map<String, Object> requestParams = new HashMap<>();
|
||||
requestParams.put("offset", offset);
|
||||
requestParams.put("offset", dayOffset);
|
||||
requestParams.put("limit", limit);
|
||||
requestParams.put("searchStartTime", searchStartTime);
|
||||
requestParams.put("searchEndTime", searchEndTime);
|
||||
requestParams.put("searchStartTime", dayStart);
|
||||
requestParams.put("searchEndTime", dayEnd);
|
||||
requestParams.put("duration", duration);
|
||||
// 调用API获取数据
|
||||
|
||||
String response = callApi(Incr_API_URL, requestParams);
|
||||
|
||||
// 如果返回数据为空,则结束同步
|
||||
if (response == null || response.isEmpty()) {
|
||||
break;
|
||||
}
|
||||
|
||||
try {
|
||||
// 将返回的数据解析为 JSONObject
|
||||
JSONObject responseJson = new JSONObject(response);
|
||||
|
||||
// 响应中没有data字段(如权限错误),终止同步
|
||||
if (!responseJson.containsKey("data")) {
|
||||
logger.error("增量同步响应中不存在data字段,终止同步 - offset: {}, 响应: {}", offset, response);
|
||||
logger.error("响应中不存在data字段,跳过当天 - 响应: {}", response);
|
||||
break;
|
||||
}
|
||||
// 检查返回的 "data" 是否为空
|
||||
if (responseJson.getJSONArray("data").size() == 0) {
|
||||
logger.info("增量同步完成,没有更多数据 - offset: {}", offset);
|
||||
break; // 如果 "data" 为空,跳出循环
|
||||
}
|
||||
|
||||
// 在这里处理 "data" 非空的情况
|
||||
// 你可以继续进行数据处理
|
||||
// ...
|
||||
|
||||
} catch (JSONException e) {
|
||||
// 如果 JSON 解析出错,打印异常并跳出循环
|
||||
logger.error("增量同步JSON解析失败 - offset: {}, 错误: {}", offset, e.getMessage());
|
||||
logger.info("当天数据拉取完成,无更多数据 - offset: {}", dayOffset);
|
||||
break;
|
||||
}
|
||||
// 解析返回数据并保存到数据库
|
||||
saveSyncData(offset, limit, requestParams, response);
|
||||
|
||||
// 更新offset值,进行下一次同步
|
||||
offset += limit;
|
||||
} catch (JSONException e) {
|
||||
logger.error("JSON解析失败 - 错误: {}", e.getMessage());
|
||||
break;
|
||||
}
|
||||
|
||||
// 增量同步后,更新最后同步时间
|
||||
saveSyncData(dayOffset, limit, requestParams, response);
|
||||
int savedCount = getSavedRecordCount(response);
|
||||
dayRecords += savedCount;
|
||||
totalRecords += savedCount;
|
||||
dayOffset += limit;
|
||||
}
|
||||
|
||||
logger.info("【增量同步】第{}天完成,共{}条记录", totalDays + 1, dayRecords);
|
||||
totalDays++;
|
||||
|
||||
// 移动到下一天
|
||||
calStart.add(Calendar.DAY_OF_MONTH, 1);
|
||||
calStart.set(Calendar.HOUR_OF_DAY, 0);
|
||||
calStart.set(Calendar.MINUTE, 0);
|
||||
calStart.set(Calendar.SECOND, 0);
|
||||
}
|
||||
|
||||
logger.info("【增量同步】全部完成,共{}天,累计{}条记录", totalDays, totalRecords);
|
||||
|
||||
} catch (ParseException e) {
|
||||
logger.error("时间解析错误: {}", e.getMessage());
|
||||
}
|
||||
|
||||
// 更新最后同步时间
|
||||
updateLastSyncTimeToDatabase(getCurrentTime());
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断两个Calendar是否是同一天
|
||||
*/
|
||||
private boolean sameDay(Calendar c1, Calendar c2) {
|
||||
return c1.get(Calendar.YEAR) == c2.get(Calendar.YEAR)
|
||||
&& c1.get(Calendar.MONTH) == c2.get(Calendar.MONTH)
|
||||
&& c1.get(Calendar.DAY_OF_MONTH) == c2.get(Calendar.DAY_OF_MONTH);
|
||||
}
|
||||
|
||||
/**
|
||||
* 从API响应中获取保存的记录数
|
||||
*/
|
||||
private int getSavedRecordCount(String response) {
|
||||
try {
|
||||
JSONObject json = new JSONObject(response);
|
||||
if (json.containsKey("data") && json.getJSONArray("data") != null) {
|
||||
return json.getJSONArray("data").size();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// ignore
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
* 获取每个学生每个项目下必修和选修的任务汇总分数
|
||||
* @return 汇总的任务分数集合
|
||||
@@ -314,21 +386,51 @@ public class SyncTaskService {
|
||||
responseJson = new JSONObject(responseData);
|
||||
dataArray = responseJson.getJSONArray("data");
|
||||
|
||||
// 第一遍:收集所有 stuUserId,批量查询用户信息(替代 N+1)
|
||||
List<String> stuUserIds = new ArrayList<>(dataArray.size());
|
||||
for (int i = 0; i < dataArray.size(); i++) {
|
||||
JSONObject taskData = dataArray.getJSONObject(i);
|
||||
String stuUserId = getStringValue(taskData, "stuUserId");
|
||||
if (!stuUserId.isEmpty()) {
|
||||
stuUserIds.add(stuUserId);
|
||||
}
|
||||
}
|
||||
// 批量查询:sync_user_info_log(stuUserId → username)
|
||||
Map<String, String> stuUserIdToUsername = new HashMap<>();
|
||||
if (!stuUserIds.isEmpty()) {
|
||||
List<SyncUserInfoLog> userInfos = syncUserInfoLogMapper.batchFindUserInfoByStuUserIds(stuUserIds);
|
||||
for (SyncUserInfoLog info : userInfos) {
|
||||
if (info.getUserId() != null && info.getUsername() != null) {
|
||||
stuUserIdToUsername.put(info.getUserId(), info.getUsername());
|
||||
}
|
||||
}
|
||||
}
|
||||
// 批量查询:t_user(username → userId)
|
||||
List<String> usernames = new ArrayList<>(stuUserIdToUsername.values());
|
||||
Map<String, Long> usernameToUserId = new HashMap<>();
|
||||
if (!usernames.isEmpty()) {
|
||||
List<TUser> tUsers = userMapper.batchFindUserIdByUsernames(usernames);
|
||||
for (TUser tUser : tUsers) {
|
||||
if (tUser.getUserNo() != null) {
|
||||
usernameToUserId.put(tUser.getUserNo(), tUser.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < dataArray.size(); i++) {
|
||||
JSONObject taskData = dataArray.getJSONObject(i);
|
||||
// 从任务数据中获取学生用户ID
|
||||
String stuUserId = getStringValue(taskData, "stuUserId");
|
||||
if (stuUserId.isEmpty()) continue;
|
||||
|
||||
|
||||
|
||||
// 1. 获取用户信息:根据云学堂的学生用户ID查询本地用户信息
|
||||
SyncUserInfoLog userInfo = syncUserInfoLogMapper.findUserInfoByStuUserId(stuUserId);
|
||||
if (userInfo == null) {
|
||||
// 1. 从缓存中获取用户信息
|
||||
String username = stuUserIdToUsername.get(stuUserId);
|
||||
if (username == null) {
|
||||
continue; // 如果在本地数据库中找不到对应的用户信息,跳过当前记录的处理
|
||||
}
|
||||
|
||||
// 2. 获取系统内部的user_id:通过用户名查找对应的用户ID
|
||||
Long userId = userMapper.findUserIdByUsername(userInfo.getUsername());
|
||||
// 2. 从缓存中获取系统内部的user_id
|
||||
Long userId = usernameToUserId.get(username);
|
||||
if (userId == null) {
|
||||
continue; // 如果找不到对应的用户ID,跳过当前记录的处理
|
||||
}
|
||||
@@ -545,15 +647,42 @@ public class SyncTaskService {
|
||||
}
|
||||
|
||||
public void processTaskScores(List<TaskScoreSummary> taskScoreSummaries) {
|
||||
// 批量查询用户信息缓存(替代 N+1)
|
||||
List<String> stuUserIds = new ArrayList<>(taskScoreSummaries.size());
|
||||
for (TaskScoreSummary summary : taskScoreSummaries) {
|
||||
// 1. 获取用户信息
|
||||
SyncUserInfoLog userInfo = syncUserInfoLogMapper.findUserInfoByStuUserId(summary.getStuUserId());
|
||||
if (userInfo == null) {
|
||||
if (summary.getStuUserId() != null) {
|
||||
stuUserIds.add(summary.getStuUserId());
|
||||
}
|
||||
}
|
||||
Map<String, String> stuUserIdToUsername = new HashMap<>();
|
||||
if (!stuUserIds.isEmpty()) {
|
||||
List<SyncUserInfoLog> userInfos = syncUserInfoLogMapper.batchFindUserInfoByStuUserIds(stuUserIds);
|
||||
for (SyncUserInfoLog info : userInfos) {
|
||||
if (info.getUserId() != null && info.getUsername() != null) {
|
||||
stuUserIdToUsername.put(info.getUserId(), info.getUsername());
|
||||
}
|
||||
}
|
||||
}
|
||||
List<String> usernames = new ArrayList<>(stuUserIdToUsername.values());
|
||||
Map<String, Long> usernameToUserId = new HashMap<>();
|
||||
if (!usernames.isEmpty()) {
|
||||
List<TUser> tUsers = userMapper.batchFindUserIdByUsernames(usernames);
|
||||
for (TUser tUser : tUsers) {
|
||||
if (tUser.getUserNo() != null) {
|
||||
usernameToUserId.put(tUser.getUserNo(), tUser.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (TaskScoreSummary summary : taskScoreSummaries) {
|
||||
// 1. 从缓存中获取用户信息
|
||||
String username = stuUserIdToUsername.get(summary.getStuUserId());
|
||||
if (username == null) {
|
||||
continue; // 如果没有找到用户信息,跳过
|
||||
}
|
||||
|
||||
// 2. 获取 user_id
|
||||
Long userId = userMapper.findUserIdByUsername(userInfo.getUsername());
|
||||
// 2. 从缓存中获取 user_id
|
||||
Long userId = usernameToUserId.get(username);
|
||||
if (userId == null) {
|
||||
continue; // 如果没有找到用户 ID,跳过
|
||||
}
|
||||
@@ -597,7 +726,7 @@ public class SyncTaskService {
|
||||
LevelScores byLevel = levelScoresMapper.findByLevel(firstTwoChars);
|
||||
if (byLevel == null) {
|
||||
logger.error("未找到对应的等级分数要求: " + firstTwoChars);
|
||||
return;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (summary.getRequiredTotalScores().compareTo(BigDecimal.valueOf(byLevel.getRequiredScore())) >= 0
|
||||
|
||||
@@ -6,6 +6,7 @@ import cn.hutool.json.JSONObject;
|
||||
import cn.wepact.dfm.training.dto.SyncRequest;
|
||||
import cn.wepact.dfm.training.dto.entity.SyncTaskLog;
|
||||
import cn.wepact.dfm.training.dto.entity.SyncUserInfoLog;
|
||||
import cn.wepact.dfm.training.dto.entity.TUser;
|
||||
import cn.wepact.dfm.training.mapper.SyncUserInfoLogMapper;
|
||||
import cn.wepact.dfm.training.mapper.TUserMapper;
|
||||
import cn.wepact.dfm.training.util.HttpClientUtil;
|
||||
@@ -33,8 +34,10 @@ import java.math.BigDecimal;
|
||||
import java.sql.Timestamp;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
@@ -243,6 +246,26 @@ public class SyncUserInfoService {
|
||||
return;
|
||||
}
|
||||
|
||||
// 第一遍:收集所有用户名,批量查询用户ID(替代 N+1 逐条查询)
|
||||
List<String> usernames = new ArrayList<>(dataArray.size());
|
||||
for (int i = 0; i < dataArray.size(); i++) {
|
||||
JSONObject dataObject = dataArray.getJSONObject(i);
|
||||
if (dataObject == null) continue;
|
||||
String u = getStringValue(dataObject, "username");
|
||||
if (!u.isEmpty()) {
|
||||
usernames.add(u);
|
||||
}
|
||||
}
|
||||
Map<String, Long> userIdCache = new HashMap<>();
|
||||
if (!usernames.isEmpty()) {
|
||||
List<TUser> tUsers = userMapper.batchFindUserIdByUsernames(usernames);
|
||||
for (TUser tUser : tUsers) {
|
||||
if (tUser.getUserNo() != null) {
|
||||
userIdCache.put(tUser.getUserNo(), tUser.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < dataArray.size(); i++) {
|
||||
JSONObject dataObject = dataArray.getJSONObject(i);
|
||||
if (dataObject == null) {
|
||||
@@ -257,8 +280,8 @@ public class SyncUserInfoService {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 获取系统内部的user_id
|
||||
Long userId = userMapper.findUserIdByUsername(username);
|
||||
// 从批量查询的缓存中获取系统内部的user_id
|
||||
Long userId = userIdCache.get(username);
|
||||
if (userId == null) {
|
||||
logger.warn("未找到用户: {}", username);
|
||||
continue;
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
server:
|
||||
servlet:
|
||||
context-path: /qualifications-service
|
||||
|
||||
spring:
|
||||
profiles:
|
||||
active: local
|
||||
|
||||
@@ -79,12 +79,12 @@
|
||||
</root>
|
||||
|
||||
|
||||
<!-- 增加SQL打印 -->
|
||||
<logger name="org.apache.ibatis" level="debug">
|
||||
<!-- 增加SQL打印(additivity=false 防止向上传播到 root 导致重复打印) -->
|
||||
<logger name="org.apache.ibatis" level="debug" additivity="false">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</logger>
|
||||
|
||||
<logger name="cn.wepact.dfm.training.mapper" level="debug">
|
||||
<logger name="cn.wepact.dfm.training.mapper" level="debug" additivity="false">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</logger>
|
||||
<!-- 增加SQL打印 end-->
|
||||
|
||||
Reference in New Issue
Block a user