huertian/jinduguanli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 限制部门用户查询只返回普通教师角色

Browse Source
This commit is contained in:
Hvemi_han
2024-12-20 17:02:57 +08:00
committed by huertian
parent d0e7990d38
commit f990f6b7a3
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/huertian/jinduguanli/service/LessonTaskService.java
View File

@ -51,7 +51,7 @@ public class LessonTaskService {
} }
@Transactional @Transactional
@CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true) @CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true)
public LessonTask create(LessonTaskRequest request) { public LessonTask create(LessonTaskRequest request) {
logger.info("开始创建课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}", logger.info("开始创建课程任务 - 课程名称: {}, 小课名称: {}, 用户ID: {}",
request.getCourseName(), request.getMicroLessonName(), request.getUserId()); request.getCourseName(), request.getMicroLessonName(), request.getUserId());
@ -65,7 +65,7 @@ public class LessonTaskService {
} }
@Transactional @Transactional
@CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true) @CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true)
public LessonTask update(Long id, LessonTaskRequest request) { public LessonTask update(Long id, LessonTaskRequest request) {
logger.info("开始更新课程任务 - 任务ID: {}, 进度状态: {}", id, request.getProgressStatus()); logger.info("开始更新课程任务 - 任务ID: {}, 进度状态: {}", id, request.getProgressStatus());
LessonTask task = findById(id); LessonTask task = findById(id);
@ -76,17 +76,34 @@ public class LessonTaskService {
// 根据进度状态更新时间戳 // 根据进度状态更新时间戳
long currentTime = System.currentTimeMillis() / 1000; long currentTime = System.currentTimeMillis() / 1000;
switch (request.getProgressStatus()) { switch (request.getProgressStatus()) {
case 0: // 初始状态
task.setScriptUploadTime(null);
task.setScriptConfirmTime(null);
task.setVideoCaptureTime(null);
task.setVideoConfirmTime(null);
task.setFinishTime(null);
break;
case 1: // 脚本上传 case 1: // 脚本上传
task.setScriptUploadTime(currentTime); task.setScriptUploadTime(currentTime);
task.setScriptConfirmTime(null);
task.setVideoCaptureTime(null);
task.setVideoConfirmTime(null);
task.setFinishTime(null);
break; break;
case 2: // 脚本确认 case 2: // 脚本确认
task.setScriptConfirmTime(currentTime); task.setScriptConfirmTime(currentTime);
task.setVideoCaptureTime(null);
task.setVideoConfirmTime(null);
task.setFinishTime(null);
break; break;
case 3: // 视频拍摄 case 3: // 视频拍摄
task.setVideoCaptureTime(currentTime); task.setVideoCaptureTime(currentTime);
task.setVideoConfirmTime(null);
task.setFinishTime(null);
break; break;
case 4: // 视频确认 case 4: // 视频确认
task.setVideoConfirmTime(currentTime); task.setVideoConfirmTime(currentTime);
task.setFinishTime(null);
break; break;
case 5: // 任务完成 case 5: // 任务完成
task.setFinishTime(currentTime); task.setFinishTime(currentTime);
@ -113,7 +130,7 @@ public class LessonTaskService {
} }
@Transactional @Transactional
@CacheEvict(value = {"lessonTasks", "lessonTask"}, allEntries = true) @CacheEvict(value = { "lessonTasks", "lessonTask" }, allEntries = true)
public void delete(Long id) { public void delete(Long id) {
logger.info("开始删除课程任务 - 任务ID: {}", id); logger.info("开始删除课程任务 - 任务ID: {}", id);
if (!lessonTaskRepository.existsById(id)) { if (!lessonTaskRepository.existsById(id)) {
@ -133,7 +150,8 @@ public class LessonTaskService {
*/ */
public Page<LessonTaskDTO> findByDepartmentIdAndNormalUser(Long departmentId, Pageable pageable) { public Page<LessonTaskDTO> findByDepartmentIdAndNormalUser(Long departmentId, Pageable pageable) {
logger.info("查询部门正常用户的课程任务，部门ID: {}", departmentId); logger.info("查询部门正常用户的课程任务，部门ID: {}", departmentId);
Page<java.util.Map<String, Object>> result = lessonTaskRepository.findByDepartmentIdAndNormalUserWithUsername(departmentId, pageable); Page<java.util.Map<String, Object>> result = lessonTaskRepository
.findByDepartmentIdAndNormalUserWithUsername(departmentId, pageable);
return result.map(map -> { return result.map(map -> {
LessonTask lessonTask = (LessonTask) map.get("lessonTask"); LessonTask lessonTask = (LessonTask) map.get("lessonTask");