|
@@ -3,7 +3,6 @@ package cn.seecoder.seecoderportalserver.service;
|
|
|
import cn.seecoder.seecoderportalcommon.vo.*;
|
|
import cn.seecoder.seecoderportalcommon.vo.*;
|
|
|
import cn.seecoder.seecoderportalserver.domain.Course;
|
|
import cn.seecoder.seecoderportalserver.domain.Course;
|
|
|
import cn.seecoder.seecoderportalserver.domain.CourseSelection;
|
|
import cn.seecoder.seecoderportalserver.domain.CourseSelection;
|
|
|
-import cn.seecoder.seecoderportalserver.mapper.CourseSelectionMapper;
|
|
|
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
|
|
import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
|
|
|
import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
|
|
import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
|
|
|
import cn.seecoder.seecoderportalserver.repository.CourseRepository;
|
|
import cn.seecoder.seecoderportalserver.repository.CourseRepository;
|
|
@@ -14,7 +13,6 @@ import cn.seecoder.seecoderportalserver.service.Impl.HelperService;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
@@ -24,17 +22,15 @@ public class CourseService {
|
|
|
private final CourseRepository courseRepository;
|
|
private final CourseRepository courseRepository;
|
|
|
private final CourseMapper courseMapper;
|
|
private final CourseMapper courseMapper;
|
|
|
private final CourseSelectionRepository courseSelectionRepository;
|
|
private final CourseSelectionRepository courseSelectionRepository;
|
|
|
- private final CourseSelectionMapper courseSelectionMapper;
|
|
|
|
|
private final UserService userService;
|
|
private final UserService userService;
|
|
|
private final CoderService coderService;
|
|
private final CoderService coderService;
|
|
|
private final HelperService helperService;
|
|
private final HelperService helperService;
|
|
|
private final EvalService evalService;
|
|
private final EvalService evalService;
|
|
|
|
|
|
|
|
- public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, CoderService coderService, HelperService helperService, EvalService evalService, UserService userService) {
|
|
|
|
|
|
|
+ public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, CourseSelectionRepository courseSelectionRepository, CoderService coderService, HelperService helperService, EvalService evalService, UserService userService) {
|
|
|
this.courseRepository = courseRepository;
|
|
this.courseRepository = courseRepository;
|
|
|
this.courseMapper = courseMapper;
|
|
this.courseMapper = courseMapper;
|
|
|
this.courseSelectionRepository = courseSelectionRepository;
|
|
this.courseSelectionRepository = courseSelectionRepository;
|
|
|
- this.courseSelectionMapper = courseSelectionMapper;
|
|
|
|
|
this.userService = userService;
|
|
this.userService = userService;
|
|
|
this.coderService = coderService;
|
|
this.coderService = coderService;
|
|
|
this.helperService = helperService;
|
|
this.helperService = helperService;
|
|
@@ -84,7 +80,7 @@ public class CourseService {
|
|
|
throw new CustomErrorException("当前用户无权删除课程");
|
|
throw new CustomErrorException("当前用户无权删除课程");
|
|
|
}
|
|
}
|
|
|
List<CourseSelection> courseSelectionList = courseSelectionRepository.findCourseSelectionsByCourseId(courseId);
|
|
List<CourseSelection> courseSelectionList = courseSelectionRepository.findCourseSelectionsByCourseId(courseId);
|
|
|
- courseSelectionList.forEach(courseSelection -> this.cancelCourseSelection(courseSelectionMapper.toCourseSelectionVO(courseSelection)));
|
|
|
|
|
|
|
+ courseSelectionList.forEach(courseSelection -> this.cancelCourseSelection(new CourseSelectionKey(courseSelection.getUserId(), courseSelection.getCourseId())));
|
|
|
course.setState(ObjectState.DELETED);
|
|
course.setState(ObjectState.DELETED);
|
|
|
courseRepository.save(courseMapper.courseVOToCourse(course));
|
|
courseRepository.save(courseMapper.courseVOToCourse(course));
|
|
|
return "课程删除成功";
|
|
return "课程删除成功";
|
|
@@ -136,17 +132,17 @@ public class CourseService {
|
|
|
return courseMapper.courseToCourseVO(course);
|
|
return courseMapper.courseToCourseVO(course);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public String confirmCourseSelection(CourseSelectionVO courseSelectionVO) {
|
|
|
|
|
- userService.findUserById(courseSelectionVO.getUserId());
|
|
|
|
|
- this.getCourseById(courseSelectionVO.getCourseId());
|
|
|
|
|
- CourseSelection courseSelection = courseSelectionMapper.toCourseSelection(courseSelectionVO);
|
|
|
|
|
|
|
+ public String confirmCourseSelection(CourseSelectionKey courseSelectionKey) {
|
|
|
|
|
+ userService.findUserById(courseSelectionKey.getUserId());
|
|
|
|
|
+ this.getCourseById(courseSelectionKey.getCourseId());
|
|
|
|
|
+ CourseSelection courseSelection = new CourseSelection(courseSelectionKey);
|
|
|
courseSelection.setState(true);
|
|
courseSelection.setState(true);
|
|
|
courseSelectionRepository.save(courseSelection);
|
|
courseSelectionRepository.save(courseSelection);
|
|
|
return "选课成功";
|
|
return "选课成功";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public String cancelCourseSelection(CourseSelectionVO courseSelectionVO) {
|
|
|
|
|
- CourseSelection record = courseSelectionRepository.findById(courseSelectionMapper.toCourseSelectionKey(courseSelectionVO)).orElseThrow(CustomErrorException::courseSelectionNotFound);
|
|
|
|
|
|
|
+ public String cancelCourseSelection(CourseSelectionKey courseSelectionKey) {
|
|
|
|
|
+ CourseSelection record = courseSelectionRepository.findById(courseSelectionKey).orElseThrow(CustomErrorException::courseSelectionNotFound);
|
|
|
if (record.getState()) {
|
|
if (record.getState()) {
|
|
|
record.setState(false);
|
|
record.setState(false);
|
|
|
courseSelectionRepository.save(record);
|
|
courseSelectionRepository.save(record);
|
|
@@ -157,9 +153,7 @@ public class CourseService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Boolean checkSelection(Long userId, Long courseId) {
|
|
public Boolean checkSelection(Long userId, Long courseId) {
|
|
|
- CourseSelectionKey key = new CourseSelectionKey();
|
|
|
|
|
- key.setUserId(userId);
|
|
|
|
|
- key.setCourseId(courseId);
|
|
|
|
|
|
|
+ CourseSelectionKey key = new CourseSelectionKey(userId, courseId);
|
|
|
CourseSelection record = courseSelectionRepository.findById(key).orElse(null);
|
|
CourseSelection record = courseSelectionRepository.findById(key).orElse(null);
|
|
|
return record != null && record.getState();
|
|
return record != null && record.getState();
|
|
|
}
|
|
}
|