This commit is contained in:
2026-06-08 16:34:31 +08:00
parent 3e9264ebc6
commit aea34dc5e4
7 changed files with 122 additions and 18 deletions

View File

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
import java.util.List;
@Mapper @Mapper
public interface SyncUserInfoLogMapper extends MyBatisBaseMapper<SyncUserInfoLog, Long> { public interface SyncUserInfoLogMapper extends MyBatisBaseMapper<SyncUserInfoLog, Long> {
@@ -22,4 +23,6 @@ public interface SyncUserInfoLogMapper extends MyBatisBaseMapper<SyncUserInfoLog
void updateLastSyncTime(Date date); void updateLastSyncTime(Date date);
SyncUserInfoLog findUserInfoByStuUserId(@Param("stuUserId") String stuUserId); SyncUserInfoLog findUserInfoByStuUserId(@Param("stuUserId") String stuUserId);
List<SyncUserInfoLog> batchFindUserInfoByStuUserIds(@Param("stuUserIds") List<String> stuUserIds);
} }

View File

@@ -150,4 +150,11 @@
<select id="findUserInfoByStuUserId" resultMap="UserResultMap"> <select id="findUserInfoByStuUserId" resultMap="UserResultMap">
SELECT user_id, username FROM sync_user_info_log WHERE user_id = #{stuUserId} SELECT user_id, username FROM sync_user_info_log WHERE user_id = #{stuUserId}
</select> </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> </mapper>

View File

@@ -22,4 +22,11 @@ public interface TUserMapper extends MyBatisBaseMapper<TUser, Long> {
*/ */
Long findUserIdByUsername(@Param("username") String username); Long findUserIdByUsername(@Param("username") String username);
/**
* 批量查询用户ID替代 N+1 循环查询)
* @param usernames 用户名列表
* @return username -> userId 映射列表
*/
List<TUser> batchFindUserIdByUsernames(@Param("usernames") List<String> usernames);
} }

View File

@@ -189,5 +189,12 @@
<select id="findUserIdByUsername" resultType="java.lang.Long"> <select id="findUserIdByUsername" resultType="java.lang.Long">
SELECT id FROM t_user WHERE user_no = #{username} SELECT id FROM t_user WHERE user_no = #{username}
</select> </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> </mapper>

View File

@@ -304,21 +304,51 @@ public class SyncTaskService {
responseJson = new JSONObject(responseData); responseJson = new JSONObject(responseData);
dataArray = responseJson.getJSONArray("data"); 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_logstuUserId → 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_userusername → 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++) { for (int i = 0; i < dataArray.size(); i++) {
JSONObject taskData = dataArray.getJSONObject(i); JSONObject taskData = dataArray.getJSONObject(i);
// 从任务数据中获取学生用户ID // 从任务数据中获取学生用户ID
String stuUserId = getStringValue(taskData, "stuUserId"); String stuUserId = getStringValue(taskData, "stuUserId");
if (stuUserId.isEmpty()) continue;
// 1. 从缓存中获取用户信息
String username = stuUserIdToUsername.get(stuUserId);
// 1. 获取用户信息根据云学堂的学生用户ID查询本地用户信息 if (username == null) {
SyncUserInfoLog userInfo = syncUserInfoLogMapper.findUserInfoByStuUserId(stuUserId);
if (userInfo == null) {
continue; // 如果在本地数据库中找不到对应的用户信息,跳过当前记录的处理 continue; // 如果在本地数据库中找不到对应的用户信息,跳过当前记录的处理
} }
// 2. 获取系统内部的user_id通过用户名查找对应的用户ID // 2. 从缓存中获取系统内部的user_id
Long userId = userMapper.findUserIdByUsername(userInfo.getUsername()); Long userId = usernameToUserId.get(username);
if (userId == null) { if (userId == null) {
continue; // 如果找不到对应的用户ID跳过当前记录的处理 continue; // 如果找不到对应的用户ID跳过当前记录的处理
} }
@@ -535,15 +565,42 @@ public class SyncTaskService {
} }
public void processTaskScores(List<TaskScoreSummary> taskScoreSummaries) { public void processTaskScores(List<TaskScoreSummary> taskScoreSummaries) {
// 批量查询用户信息缓存(替代 N+1
List<String> stuUserIds = new ArrayList<>(taskScoreSummaries.size());
for (TaskScoreSummary summary : taskScoreSummaries) { for (TaskScoreSummary summary : taskScoreSummaries) {
// 1. 获取用户信息 if (summary.getStuUserId() != null) {
SyncUserInfoLog userInfo = syncUserInfoLogMapper.findUserInfoByStuUserId(summary.getStuUserId()); stuUserIds.add(summary.getStuUserId());
if (userInfo == null) { }
}
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; // 如果没有找到用户信息,跳过 continue; // 如果没有找到用户信息,跳过
} }
// 2. 获取 user_id // 2. 从缓存中获取 user_id
Long userId = userMapper.findUserIdByUsername(userInfo.getUsername()); Long userId = usernameToUserId.get(username);
if (userId == null) { if (userId == null) {
continue; // 如果没有找到用户 ID跳过 continue; // 如果没有找到用户 ID跳过
} }

View File

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONObject;
import cn.wepact.dfm.training.dto.SyncRequest; import cn.wepact.dfm.training.dto.SyncRequest;
import cn.wepact.dfm.training.dto.entity.SyncTaskLog; import cn.wepact.dfm.training.dto.entity.SyncTaskLog;
import cn.wepact.dfm.training.dto.entity.SyncUserInfoLog; 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.SyncUserInfoLogMapper;
import cn.wepact.dfm.training.mapper.TUserMapper; import cn.wepact.dfm.training.mapper.TUserMapper;
import cn.wepact.dfm.training.util.HttpClientUtil; import cn.wepact.dfm.training.util.HttpClientUtil;
@@ -33,8 +34,10 @@ import java.math.BigDecimal;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
@Service @Service
@@ -199,6 +202,26 @@ public class SyncUserInfoService {
return; 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++) { for (int i = 0; i < dataArray.size(); i++) {
JSONObject dataObject = dataArray.getJSONObject(i); JSONObject dataObject = dataArray.getJSONObject(i);
if (dataObject == null) { if (dataObject == null) {
@@ -213,8 +236,8 @@ public class SyncUserInfoService {
continue; continue;
} }
// 获取系统内部的user_id // 从批量查询的缓存中获取系统内部的user_id
Long userId = userMapper.findUserIdByUsername(username); Long userId = userIdCache.get(username);
if (userId == null) { if (userId == null) {
logger.warn("未找到用户: {}", username); logger.warn("未找到用户: {}", username);
continue; continue;

View File

@@ -79,12 +79,12 @@
</root> </root>
<!-- 增加SQL打印 --> <!-- 增加SQL打印additivity=false 防止向上传播到 root 导致重复打印) -->
<logger name="org.apache.ibatis" level="debug"> <logger name="org.apache.ibatis" level="debug" additivity="false">
<appender-ref ref="STDOUT"/> <appender-ref ref="STDOUT"/>
</logger> </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"/> <appender-ref ref="STDOUT"/>
</logger> </logger>
<!-- 增加SQL打印 end--> <!-- 增加SQL打印 end-->