wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端和json优化

Browse Source
This commit is contained in:
wangys
2025-11-28 17:16:17 +08:00
parent 34e69c7f62
commit dfb11c85f1
135 changed files with 930 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
schoolNewsServ/study/src/main/java/org/xyzh/study/controller/LearningRecordController.java
View File

@@ -57,7 +57,7 @@ public class LearningRecordController {
*/
@DeleteMapping("/record")
public ResultDomain<Boolean> deleteLearningRecord(@RequestBody TbLearningRecord learningRecord) {
return learningRecordService.deleteLearningRecord(learningRecord.getID());
return learningRecordService.deleteLearningRecord(learningRecord.getId());
}
@PutMapping("/complete")

32
schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCCourseServiceImpl.java
View File

@@ -152,8 +152,8 @@ public class SCCourseServiceImpl implements SCCourseService {
// 转换为课程实体并保存
TbCourse course = courseItemVO.toCourse();
String courseID = IDUtils.generateID();
course.setID(IDUtils.generateID());
course.setCreator(user.getID());
course.setId(IDUtils.generateID());
course.setCreator(user.getId());
course.setCourseID(courseID);
Date now = new Date();
course.setCreateTime(now);
@@ -174,10 +174,10 @@ public class SCCourseServiceImpl implements SCCourseService {
TbCourseChapter chapter = chapterVO.toChapter();
String chapterID = IDUtils.generateID();
chapter.setID(IDUtils.generateID());
chapter.setId(IDUtils.generateID());
chapter.setChapterID(chapterID);
chapter.setCourseID(courseID);
chapter.setCreator(user.getID());
chapter.setCreator(user.getId());
chapter.setCreateTime(now);
chapter.setOrderNum(i);
chapters.add(chapter);
@@ -193,10 +193,10 @@ public class SCCourseServiceImpl implements SCCourseService {
TbCourseNode node = nodeVO.toNode();
String nodeID = IDUtils.generateID();
node.setID(IDUtils.generateID());
node.setId(IDUtils.generateID());
node.setNodeID(nodeID);
node.setChapterID(chapterID);
node.setCreator(user.getID());
node.setCreator(user.getId());
node.setCreateTime(now);
node.setOrderNum(j);
allNodes.add(node);
@@ -254,7 +254,7 @@ public class SCCourseServiceImpl implements SCCourseService {
// 1. 更新课程基本信息
TbCourse course = courseItemVO.toCourse();
course.setUpdater(user.getID());
course.setUpdater(user.getId());
Date now = new Date();
course.setUpdateTime(now);
courseMapper.updateCourse(course);
@@ -305,15 +305,15 @@ public class SCCourseServiceImpl implements SCCourseService {
if (chapterID == null || chapterID.isEmpty() || !existingChapterMap.containsKey(chapterID)) {
// 新增章节
chapterID = IDUtils.generateID();
chapter.setID(IDUtils.generateID());
chapter.setId(IDUtils.generateID());
chapter.setChapterID(chapterID);
chapter.setCreator(user.getID());
chapter.setCreator(user.getId());
chapter.setCreateTime(now);
chaptersToInsert.add(chapter);
} else {
// 更新章节
chapter.setID(existingChapterMap.get(chapterID).getID());
chapter.setUpdater(user.getID());
chapter.setId(existingChapterMap.get(chapterID).getId());
chapter.setUpdater(user.getId());
chapter.setUpdateTime(now);
chaptersToUpdate.add(chapter);
}
@@ -345,15 +345,15 @@ public class SCCourseServiceImpl implements SCCourseService {
if (nodeID == null || nodeID.isEmpty() || !existingNodeMap.containsKey(nodeID)) {
// 新增节点
nodeID = IDUtils.generateID();
node.setID(IDUtils.generateID());
node.setId(IDUtils.generateID());
node.setNodeID(nodeID);
node.setCreator(user.getID());
node.setCreator(user.getId());
node.setCreateTime(now);
nodesToInsert.add(node);
} else {
// 更新节点
node.setID(existingNodeMap.get(nodeID).getID());
node.setUpdater(user.getID());
node.setId(existingNodeMap.get(nodeID).getId());
node.setUpdater(user.getId());
node.setUpdateTime(now);
nodesToUpdate.add(node);
}
@@ -680,7 +680,7 @@ public class SCCourseServiceImpl implements SCCourseService {
.collect(Collectors.toList());
// 查询带进度的节点（传入用户ID）
List<CourseItemVO> nodesWithProgress = courseNodeMapper.selectNodesProgress(chapterIDs, user.getID());
List<CourseItemVO> nodesWithProgress = courseNodeMapper.selectNodesProgress(chapterIDs, user.getId());
// 转换章节为CourseItemVO列表
List<CourseItemVO> chapterVOs = chapters.stream()

16
schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningHistoryServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService {
resultDomain.fail("用户未登录");
return resultDomain;
}
learningHistory.setUserID(currentUser.getID());
learningHistory.setUserID(currentUser.getId());
}
if (learningHistory.getResourceType() == null) {
@@ -103,7 +103,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService {
}
} else {
// 插入新记录
learningHistory.setID(IDUtils.generateID());
learningHistory.setId(IDUtils.generateID());
learningHistory.setHistoryID(IDUtils.generateID());
learningHistory.setCreateTime(new Date());
@@ -111,7 +111,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService {
if (result > 0) {
resultDomain.success("记录学习历史成功", learningHistory);
logger.info("记录学习历史成功，ID: {}, 用户ID: {}, 资源类型: {}, 时长: {}秒",
learningHistory.getID(), learningHistory.getUserID(),
learningHistory.getId(), learningHistory.getUserID(),
learningHistory.getResourceType(), learningHistory.getDuration());
} else {
resultDomain.fail("记录学习历史失败");
@@ -146,13 +146,13 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService {
resultDomain.fail("用户未登录");
return resultDomain;
}
learningHistory.setUserID(currentUser.getID());
learningHistory.setUserID(currentUser.getId());
}
if (learningHistory.getStartTime() == null) {
learningHistory.setStartTime(now);
}
if (learningHistory.getID() == null || learningHistory.getID().isEmpty()) {
learningHistory.setID(IDUtils.generateID());
if (learningHistory.getId() == null || learningHistory.getId().isEmpty()) {
learningHistory.setId(IDUtils.generateID());
}
if (learningHistory.getCreateTime() == null) {
learningHistory.setCreateTime(now);
@@ -364,7 +364,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService {
if (filter == null) {
filter = new TbLearningHistory();
}
filter.setUserID(currentUser.getID());
filter.setUserID(currentUser.getId());
return getLearningHistories(filter);
} catch (Exception e) {
@@ -386,7 +386,7 @@ public class SCLearningHistoryServiceImpl implements SCLearningHistoryService {
return resultDomain;
}
return getUserLearningStatisticsByPeriod(currentUser.getID(), periodType);
return getUserLearningStatisticsByPeriod(currentUser.getId(), periodType);
} catch (Exception e) {
logger.error("查询当前用户学习统计异常", e);

16
schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningRecordServiceImpl.java
View File

@@ -59,7 +59,7 @@ public class SCLearningRecordServiceImpl implements LearningRecordService {
resultDomain.fail("请先登录");
return resultDomain;
}
learningRecord.setUserID(user.getID());
learningRecord.setUserID(user.getId());
learningRecord.setCreateTime(new Date());
if (learningRecord.getResourceType() == null) {
resultDomain.fail("资源类型不能为空");
@@ -78,13 +78,13 @@ public class SCLearningRecordServiceImpl implements LearningRecordService {
resultDomain.fail("学习记录已存在");
return resultDomain;
}
List<TaskItemVO> allTaskItems = taskItemMapper.selectTaskItemVOByTaskIdAndUserId(learningRecord.getTaskID(), user.getID());
List<TaskItemVO> allTaskItems = taskItemMapper.selectTaskItemVOByTaskIdAndUserId(learningRecord.getTaskID(), user.getId());
if (allTaskItems == null || allTaskItems.isEmpty()) {
TbTaskUser taskUser = new TbTaskUser();
taskUser.setTaskID(learningRecord.getTaskID());
taskUser.setUserID(user.getID());
taskUser.setUserID(user.getId());
taskUser.setProgress(new BigDecimal(0));
taskUser.setUpdater(user.getID());
taskUser.setUpdater(user.getId());
// 全部完成
taskUser.setStatus(1);
@@ -110,7 +110,7 @@ public class SCLearningRecordServiceImpl implements LearningRecordService {
resultDomain.fail("请先登录");
return resultDomain;
}
learningRecord.setUpdater(user.getID());
learningRecord.setUpdater(user.getId());
int result = learningRecordMapper.updateLearningRecord(learningRecord);
if (result > 0) {
@@ -167,7 +167,7 @@ public class SCLearningRecordServiceImpl implements LearningRecordService {
resultDomain.fail("请先登录");
return resultDomain;
}
learningRecord.setUserID(user.getID());
learningRecord.setUserID(user.getId());
if (learningRecord.getResourceID() == null) {
resultDomain.fail("资源ID不能为空");
return resultDomain;
@@ -206,14 +206,14 @@ public class SCLearningRecordServiceImpl implements LearningRecordService {
resultDomain.fail("请先登录");
return resultDomain;
}
learningRecord.setUpdater(user.getID());
learningRecord.setUpdater(user.getId());
learningRecord.setCompleteTime(new Date());
learningRecord.setIsComplete(true);
int result = learningRecordMapper.updateLearningRecord(learningRecord);
if (result > 0) {
// 检查是否完成了该任务的所有任务项
String taskId = learningRecord.getTaskID();
String userId = user.getID();
String userId = user.getId();
if (taskId != null && !taskId.isEmpty()) {
checkAndUpdateTaskCompletion(taskId, userId);
}

48
schoolNewsServ/study/src/main/java/org/xyzh/study/service/impl/SCLearningTaskServiceImpl.java
View File

@@ -93,10 +93,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
List<TbTaskUser> taskUsers = new ArrayList<>();
for (String userID : userIDs) {
TbTaskUser taskUser = new TbTaskUser();
taskUser.setID(IDUtils.generateID());
taskUser.setId(IDUtils.generateID());
taskUser.setTaskID(taskID);
taskUser.setUserID(userID);
taskUser.setCreator(user.getID());
taskUser.setCreator(user.getId());
taskUser.setCreateTime(new Date());
taskUsers.add(taskUser);
}
@@ -177,7 +177,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
resultDomain.fail("请先登录");
return resultDomain;
}
filter.setUserID(user.getID());
filter.setUserID(user.getId());
// 获取当前用户的部门角色
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
List<TaskItemVO> taskList = learningTaskMapper.selectUserLearningTasksPage(filter, pageParam, userDeptRoles);
@@ -199,8 +199,8 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
Date now = new Date();
// 创建任务
TbLearningTask learningTask = taskVO.getLearningTask();
learningTask.setCreator(currentUser.getID());
learningTask.setID(IDUtils.generateID());
learningTask.setCreator(currentUser.getId());
learningTask.setId(IDUtils.generateID());
learningTask.setTaskID(taskID);
learningTask.setCreateTime(now);
learningTaskMapper.insertLearningTask(learningTask);
@@ -213,7 +213,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
taskCourses.forEach(item -> {
item.setTaskID(taskID);
item.setItemType(TaskItemType.COURSE.getValue());
item.setCreator(currentUser.getID());
item.setCreator(currentUser.getId());
item.setCreateTime(now);
});
taskItems.addAll(taskCourses);
@@ -223,7 +223,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
taskResources.forEach(item -> {
item.setTaskID(taskID);
item.setItemType(TaskItemType.RESOURCE.getValue());
item.setCreator(currentUser.getID());
item.setCreator(currentUser.getId());
item.setCreateTime(now);
});
taskItems.addAll(taskResources);
@@ -237,7 +237,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
List<TbTaskUser> taskUsers = taskVO.toTaskUsers();
taskUsers.forEach(item -> {
item.setTaskID(taskID);
item.setCreator(currentUser.getID());
item.setCreator(currentUser.getId());
item.setCreateTime(now);
});
taskUserMapper.batchInsertTaskUsers(taskUsers);
@@ -251,10 +251,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
List<TbLearningTaskTag> taskTagList = new ArrayList<>();
for (TagVO tag : taskTags) {
TbLearningTaskTag taskTag = new TbLearningTaskTag();
taskTag.setID(IDUtils.generateID());
taskTag.setId(IDUtils.generateID());
taskTag.setTaskID(taskID);
taskTag.setTagID(tag.getTagID());
taskTag.setCreator(currentUser.getID());
taskTag.setCreator(currentUser.getId());
taskTag.setCreateTime(now);
taskTagList.add(taskTag);
}
@@ -302,7 +302,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
Date now = new Date();
// 1. 更新任务基本信息
task.setUpdater(user.getID());
task.setUpdater(user.getId());
task.setUpdateTime(now);
learningTaskMapper.updateLearningTask(task);
@@ -346,13 +346,13 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
if (!existingCourseMap.containsKey(courseID)) {
TbTaskItem taskItem = new TbTaskItem();
taskItem.setID(IDUtils.generateID());
taskItem.setId(IDUtils.generateID());
taskItem.setTaskID(taskID);
taskItem.setItemType(TaskItemType.COURSE.getValue());
taskItem.setItemID(courseID);
taskItem.setRequired(item.getRequired());
taskItem.setOrderNum(item.getOrderNum());
taskItem.setCreator(user.getID());
taskItem.setCreator(user.getId());
taskItem.setCreateTime(now);
itemsToInsert.add(taskItem);
}
@@ -368,13 +368,13 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
if (!existingResourceMap.containsKey(resourceID)) {
TbTaskItem taskItem = new TbTaskItem();
taskItem.setID(IDUtils.generateID());
taskItem.setId(IDUtils.generateID());
taskItem.setTaskID(taskID);
taskItem.setItemType(TaskItemType.RESOURCE.getValue());
taskItem.setItemID(resourceID);
taskItem.setRequired(item.getRequired());
taskItem.setOrderNum(item.getOrderNum());
taskItem.setCreator(user.getID());
taskItem.setCreator(user.getId());
taskItem.setCreateTime(now);
itemsToInsert.add(taskItem);
}
@@ -384,10 +384,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
List<String> itemIDsToDelete = new ArrayList<>();
existingCourseMap.values().stream()
.filter(item -> !newCourseIDs.contains(item.getItemID()))
.forEach(item -> itemIDsToDelete.add(item.getID()));
.forEach(item -> itemIDsToDelete.add(item.getId()));
existingResourceMap.values().stream()
.filter(item -> !newResourceIDs.contains(item.getItemID()))
.forEach(item -> itemIDsToDelete.add(item.getID()));
.forEach(item -> itemIDsToDelete.add(item.getId()));
if (!itemIDsToDelete.isEmpty()) {
taskItemMapper.batchDeleteTaskItems(itemIDsToDelete);
@@ -423,10 +423,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
// 如果不存在，则新增
if (!existingUserMap.containsKey(userID)) {
TbTaskUser taskUser = new TbTaskUser();
taskUser.setID(IDUtils.generateID());
taskUser.setId(IDUtils.generateID());
taskUser.setTaskID(taskID);
taskUser.setUserID(userID);
taskUser.setCreator(user.getID());
taskUser.setCreator(user.getId());
taskUser.setCreateTime(now);
usersToInsert.add(taskUser);
}
@@ -473,10 +473,10 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
// 如果不存在，则新增
if (!existingTagMap.containsKey(tagID)) {
TbLearningTaskTag taskTag = new TbLearningTaskTag();
taskTag.setID(IDUtils.generateID());
taskTag.setId(IDUtils.generateID());
taskTag.setTaskID(taskID);
taskTag.setTagID(tagID);
taskTag.setCreator(user.getID());
taskTag.setCreator(user.getId());
taskTag.setCreateTime(now);
tagsToInsert.add(taskTag);
}
@@ -628,7 +628,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
taskVO.setLearningTaskNum(learningTaskNum);
taskVO.setNotStartTaskNum(notStartTaskNum);
List<TaskItemVO> taskUsers = taskUserMapper.selectUserTaskItem(taskID, LoginUtil.getCurrentUser().getID());
List<TaskItemVO> taskUsers = taskUserMapper.selectUserTaskItem(taskID, LoginUtil.getCurrentUser().getId());
taskVO.setLearningTask(task);
taskVO.setTaskCourses(taskCourses);
taskVO.setTaskResources(taskResources);
@@ -733,7 +733,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
return resultDomain;
}
TbLearningTask task = new TbLearningTask();
task.setUpdater(user.getID());
task.setUpdater(user.getId());
task.setUpdateTime(new Date());
task.setTaskID(taskID);
task.setStatus(status);
@@ -853,7 +853,7 @@ public class SCLearningTaskServiceImpl implements LearningTaskService {
// 按标签统计当前用户在时间范围内任务的平均完成进度
List<Map<String, Object>> tagProgressList = learningTaskMapper.getTaskStaticByTag(filter, userDeptRoles,
currentUser.getID());
currentUser.getId());
statisticsData.put("tagProgressList", tagProgressList);