Explorar o código

fix: 调整controller、service、mapper、repository之间的依赖关系

mjh %!s(int64=4) %!d(string=hai) anos
pai
achega
e5909c0bec

+ 1 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java

@@ -66,7 +66,7 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/course/teacher",
                         "/api/course/delete",
                         "/api/course/update",
-                        "/api/course",
+                        "/api/course/getCourseById",
                         "/api/course/student",
                         "/api/course/example",
                         "/api/course/getCourseByCoderId",

+ 10 - 17
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/AnnouncementMapperImpl.java

@@ -5,28 +5,23 @@ import cn.seecoder.seecoderportalserver.domain.Announcement;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
-import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
-import cn.seecoder.seecoderportalserver.mapper.UserMapper;
-import cn.seecoder.seecoderportalserver.repository.CourseRepository;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import cn.seecoder.seecoderportalserver.service.CourseService;
+import cn.seecoder.seecoderportalserver.service.UserService;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;
 
 @Component
 public class AnnouncementMapperImpl implements AnnouncementMapper {
-    private final UserRepository userRepository;
-    private final UserMapper userMapper;
-    private final CourseRepository courseRepository;
-    private final CourseMapper courseMapper;
+    private final UserService userService;
+    private final CourseService courseService;
 
-    public AnnouncementMapperImpl(UserRepository userRepository, UserMapper userMapper, CourseRepository courseRepository, CourseMapper courseMapper) {
-        this.userRepository = userRepository;
-        this.userMapper = userMapper;
-        this.courseRepository = courseRepository;
-        this.courseMapper = courseMapper;
+    public AnnouncementMapperImpl(UserService userService, CourseService courseService) {
+        this.userService = userService;
+        this.courseService = courseService;
     }
 
+
     @Override
     public AnnouncementVO toAnnouncementVO(Announcement announcement) {
         if (announcement == null) {
@@ -36,10 +31,8 @@ public class AnnouncementMapperImpl implements AnnouncementMapper {
         AnnouncementVO announcementVO = new AnnouncementVO();
 
         announcementVO.setId(announcement.getId());
-        Optional<User> sender = userRepository.findById(announcement.getSenderId());
-        sender.ifPresent(user -> announcementVO.setSender(userMapper.userToUserVO(user)));
-        Optional<Course> course = courseRepository.findById(announcement.getCourseId());
-        course.ifPresent(course1 -> announcementVO.setCourse(courseMapper.courseToCourseVO(course1)));
+        announcementVO.setSender(userService.findUserById(announcement.getSenderId()));
+        announcementVO.setCourse(courseService.getCourseById(announcement.getCourseId()));
         announcementVO.setTitle(announcement.getTitle());
         announcementVO.setContent(announcement.getContent());
         announcementVO.setCreatedAt(announcement.getCreatedAt());

+ 4 - 10
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/CourseMapperImpl.java

@@ -4,21 +4,16 @@ import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
-import cn.seecoder.seecoderportalserver.mapper.UserMapper;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
+import cn.seecoder.seecoderportalserver.service.UserService;
 import org.springframework.stereotype.Component;
 
 import java.util.Optional;
 
 @Component
 public class CourseMapperImpl implements CourseMapper {
-    private final UserRepository userRepository;
-    private final UserMapper userMapper;
+    private final UserService userService;
 
-    public CourseMapperImpl(UserRepository userRepository, UserMapper userMapper) {
-        this.userRepository = userRepository;
-        this.userMapper = userMapper;
-    }
+    public CourseMapperImpl(UserService userService) {this.userService = userService;}
 
     @Override
     public CourseVO courseToCourseVO(Course course) {
@@ -30,8 +25,7 @@ public class CourseMapperImpl implements CourseMapper {
 
         courseVO.setId(course.getId());
         courseVO.setName(course.getName());
-        Optional<User> teacher = userRepository.findById(course.getTeacherId());
-        teacher.ifPresent(user -> courseVO.setTeacher(userMapper.userToUserVO(user)));
+        courseVO.setTeacher(userService.findUserById(course.getTeacherId()));
         courseVO.setSemester(course.getSemester());
         courseVO.setImageUrl(course.getImageUrl());
         courseVO.setDescription(course.getDescription());

+ 17 - 45
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/MessageMapperImpl.java

@@ -1,40 +1,26 @@
 package cn.seecoder.seecoderportalserver.mapper.impl;
 
 import cn.seecoder.seecoderportalcommon.vo.MessageVO;
-import cn.seecoder.seecoderportalserver.domain.Announcement;
-import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.Message;
-import cn.seecoder.seecoderportalserver.domain.User;
-import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
-import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
-import cn.seecoder.seecoderportalserver.mapper.UserMapper;
-import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
-import cn.seecoder.seecoderportalserver.repository.CourseRepository;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
-import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
-import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
-import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
+import cn.seecoder.seecoderportalserver.repository.MessageRepository;
+import cn.seecoder.seecoderportalserver.service.AnnouncementService;
+import cn.seecoder.seecoderportalserver.service.CourseService;
+import cn.seecoder.seecoderportalserver.service.UserService;
 import org.springframework.stereotype.Component;
 
-import java.util.Optional;
-
 @Component
 public class MessageMapperImpl implements MessageMapper {
-    private final UserRepository userRepository;
-    private final UserMapper userMapper;
-    private final CourseRepository courseRepository;
-    private final CourseMapper courseMapper;
-    private final AnnouncementRepository announcementRepository;
-    private final AnnouncementMapper announcementMapper;
+    private final UserService userService;
+    private final CourseService courseService;
+    private final AnnouncementService announcementService;
+    private final MessageRepository messageRepository;
 
-    public MessageMapperImpl(UserRepository userRepository, UserMapper userMapper, CourseRepository courseRepository, CourseMapper courseMapper, AnnouncementRepository announcementRepository, AnnouncementMapper announcementMapper) {
-        this.userRepository = userRepository;
-        this.userMapper = userMapper;
-        this.courseRepository = courseRepository;
-        this.courseMapper = courseMapper;
-        this.announcementRepository = announcementRepository;
-        this.announcementMapper = announcementMapper;
+    public MessageMapperImpl(UserService userService, CourseService courseService, AnnouncementService announcementService, MessageRepository messageRepository) {
+        this.userService = userService;
+        this.courseService = courseService;
+        this.announcementService = announcementService;
+        this.messageRepository = messageRepository;
     }
 
     @Override
@@ -65,33 +51,19 @@ public class MessageMapperImpl implements MessageMapper {
         MessageVO messageVO = new MessageVO();
 
         messageVO.setId(message.getId());
-        Optional<User> optionalUser = userRepository.findById(message.getSenderId());
-        if (optionalUser.isPresent()) {
-            messageVO.setSender(userMapper.userToUserVO(optionalUser.get()));
-        } else {
-            throw new PortalException(ExceptionType.ERROR, "消息发送者不存在");
-        }
+        messageVO.setSender(userService.findUserById(message.getSenderId()));
         messageVO.setActionType(message.getActionType());
         messageVO.setTargetType(message.getTargetType());
         messageVO.setTargetId(message.getTargetId());
         switch (message.getTargetType()) {
             case COURSE:
-                Optional<Course> optionalCourse = courseRepository.findById(message.getTargetId());
-                if (optionalCourse.isPresent()) {
-                    messageVO.setTarget(courseMapper.courseToCourseVO(optionalCourse.get()));
-                } else {
-                    throw new PortalException(ExceptionType.ERROR, "消息有关课程不存在");
-                }
+                messageVO.setTarget(courseService.getCourseById(message.getTargetId()));
                 break;
             case COMMENT:
+                messageVO.setTarget(this.toMessageVO(messageRepository.findById(message.getTargetId()).orElse(null)));
                 break;
             case ANNOUNCEMENT:
-                Optional<Announcement> optionalAnnouncement = announcementRepository.findById(message.getId());
-                if(optionalAnnouncement.isPresent()){
-                    messageVO.setTarget(announcementMapper.toAnnouncementVO(optionalAnnouncement.get()));
-                }else{
-                    throw new PortalException(ExceptionType.ERROR, "消息有关公告不存在");
-                }
+                messageVO.setTarget(announcementService.getAnnouncementById(message.getTargetId()));
                 break;
             default:
                 break;

+ 21 - 43
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -1,45 +1,36 @@
 package cn.seecoder.seecoderportalserver.service;
 
 import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
+import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
+import cn.seecoder.seecoderportalcommon.vo.UserVO;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
-import cn.seecoder.seecoderportalserver.domain.Course;
-import cn.seecoder.seecoderportalserver.domain.User;
+import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
 import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
 import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
 import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
-import cn.seecoder.seecoderportalserver.repository.CourseRepository;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 @Service
 public class AnnouncementService {
     private final AnnouncementRepository announcementRepository;
     private final AnnouncementMapper announcementMapper;
-    private final CourseRepository courseRepository;
-    private final UserRepository userRepository;
+    private final CourseService courseService;
+    private final UserService userService;
 
-    public AnnouncementService(AnnouncementRepository announcementRepository, AnnouncementMapper announcementMapper, CourseRepository courseRepository, UserRepository userRepository) {
+    public AnnouncementService(AnnouncementRepository announcementRepository, AnnouncementMapper announcementMapper, CourseService courseService, UserService userService) {
         this.announcementRepository = announcementRepository;
         this.announcementMapper = announcementMapper;
-        this.courseRepository = courseRepository;
-        this.userRepository = userRepository;
+        this.courseService = courseService;
+        this.userService = userService;
     }
 
     public AnnouncementVO create(AnnouncementVO announcementVO) {
-        Optional<User> sender = userRepository.findById(announcementVO.getSender().getId());
-        if (!sender.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该公告发布者不存在");
-        }
-        Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
-        if (!course.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该课程不存在");
-        }
-        if (!sender.get().getId().equals(course.get().getTeacherId())) {
-            throw new PortalException(ExceptionType.ERROR, "公告发布者与课程教师不相同");
+        UserVO sender = userService.findUserById(announcementVO.getSender().getId());
+        CourseVO course = courseService.getCourseById(announcementVO.getCourse().getId());
+        if (!sender.getId().equals(course.getTeacher().getId())) {
+            throw new CustomErrorException("当前用户无权发布公告");
         }
         Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
         announcement.setState(ObjectState.NORMAL);
@@ -48,29 +39,19 @@ public class AnnouncementService {
     }
 
     public String delete(Long id, Long userId) {
-        Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
-        if (!optionalAnnouncement.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该公告不存在");
-        }
-        Announcement announcement = optionalAnnouncement.get();
-        if (!announcement.getSenderId().equals(userId)) {
-            throw new PortalException(ExceptionType.ERROR, "当前角色无法删除该公告");
+        AnnouncementVO announcement = this.getAnnouncementById(id);
+        if (!announcement.getSender().getId().equals(userId)) {
+            throw new PortalException(ExceptionType.ERROR, "当前用户无权删除公告");
         }
         announcement.setState(ObjectState.DELETED);
-        announcementRepository.save(announcement);
+        announcementRepository.save(announcementMapper.toAnnouncement(announcement));
         return "公告删除完成。";
     }
 
     public AnnouncementVO update(AnnouncementVO announcementVO) {
-        Optional<Announcement> oldAnnouncement = announcementRepository.findById(announcementVO.getId());
-        if (!oldAnnouncement.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "原公告不存在");
-        }
-        Optional<Course> course = courseRepository.findById(announcementVO.getCourse().getId());
-        if (!course.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该课程不存在");
-        }
-        if (!announcementVO.getSender().getId().equals(course.get().getTeacherId())) {
+        this.getAnnouncementById(announcementVO.getId());
+        CourseVO course = courseService.getCourseById(announcementVO.getCourse().getId());
+        if (!announcementVO.getSender().getId().equals(course.getTeacher().getId())) {
             throw new PortalException(ExceptionType.ERROR, "当前用户无权修改公告");
         }
         Announcement announcement = announcementMapper.toAnnouncement(announcementVO);
@@ -79,10 +60,7 @@ public class AnnouncementService {
     }
 
     public AnnouncementVO getAnnouncementById(Long id) {
-        Optional<Announcement> announcement = announcementRepository.findById(id);
-        if (!announcement.isPresent()) {
-            throw new PortalException(ExceptionType.ERROR, "该公告不存在");
-        }
-        return announcementMapper.toAnnouncementVO(announcement.get());
+        Announcement announcement = announcementRepository.findById(id).orElseThrow(CustomErrorException::announcementNotFound);
+        return announcementMapper.toAnnouncementVO(announcement);
     }
 }

+ 0 - 64
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseSelectionService.java

@@ -1,64 +0,0 @@
-package cn.seecoder.seecoderportalserver.service;
-
-import cn.seecoder.seecoderportalcommon.vo.CourseSelectionVO;
-import cn.seecoder.seecoderportalserver.domain.Course;
-import cn.seecoder.seecoderportalserver.domain.CourseSelection;
-import cn.seecoder.seecoderportalcommon.vo.CourseSelectionKey;
-import cn.seecoder.seecoderportalserver.domain.User;
-import cn.seecoder.seecoderportalserver.mapper.CourseSelectionMapper;
-import cn.seecoder.seecoderportalserver.repository.CourseRepository;
-import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
-import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Optional;
-
-@Service
-@Transactional(rollbackFor = RuntimeException.class)
-public class CourseSelectionService {
-    private final CourseSelectionRepository courseSelectionRepository;
-    private final CourseSelectionMapper courseSelectionMapper;
-    private final UserRepository userRepository;
-    private final CourseRepository courseRepository;
-
-    public CourseSelectionService(CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, UserRepository userRepository, CourseRepository courseRepository) {
-        this.courseSelectionRepository = courseSelectionRepository;
-        this.courseSelectionMapper = courseSelectionMapper;
-        this.userRepository = userRepository;
-        this.courseRepository = courseRepository;
-    }
-
-    public String confirmCourseSelection(CourseSelectionVO courseSelectionVO) {
-        Optional<User> user = userRepository.findById(courseSelectionVO.getUserId());
-        if (!user.isPresent()) throw new CustomErrorException("用户不存在");
-        Optional<Course> course = courseRepository.findById(courseSelectionVO.getCourseId());
-        if (!course.isPresent()) throw new CustomErrorException("课程不存在");
-        CourseSelection courseSelection = courseSelectionMapper.toCourseSelection(courseSelectionVO);
-        courseSelection.setState(true);
-        courseSelectionRepository.save(courseSelection);
-        return "选课成功";
-    }
-
-    public String cancelCourseSelection(CourseSelectionVO courseSelectionVO) {
-        CourseSelectionKey courseSelectionKey = courseSelectionMapper.toCourseSelectionKey(courseSelectionVO);
-        Optional<CourseSelection> record = courseSelectionRepository.findById(courseSelectionKey);
-        if(record.isPresent() && record.get().getState()){
-            CourseSelection courseSelection = record.get();
-            courseSelection.setState(false);
-            courseSelectionRepository.save(courseSelection);
-            return "选课记录已删除";
-        }else{
-            throw new CustomErrorException("选课记录不存在");
-        }
-    }
-
-    public Boolean checkSelection(Long userId, Long courseId){
-        CourseSelectionKey key = new CourseSelectionKey();
-        key.setUserId(userId);
-        key.setCourseId(courseId);
-        Optional<CourseSelection> record = courseSelectionRepository.findById(key);
-        return record.isPresent() && record.get().getState();
-    }
-}

+ 65 - 53
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -1,71 +1,55 @@
 package cn.seecoder.seecoderportalserver.service;
 
-import cn.seecoder.seecoderportalcommon.vo.ObjectState;
-import cn.seecoder.seecoderportalcommon.vo.CourseVO;
-import cn.seecoder.seecoderportalcommon.vo.UserRole;
+import cn.seecoder.seecoderportalcommon.vo.*;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
-import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.mapper.CourseSelectionMapper;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import cn.seecoder.seecoderportalserver.mapper.CourseMapper;
 import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.CourseSelectionRepository;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
 import cn.seecoder.seecoderportalserver.service.Impl.CoderService;
 import cn.seecoder.seecoderportalserver.service.Impl.EvalService;
 import cn.seecoder.seecoderportalserver.service.Impl.HelperService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = RuntimeException.class)
 public class CourseService {
-    private static final Logger log = LoggerFactory.getLogger(CourseService.class);
-
     private final CourseRepository courseRepository;
     private final CourseMapper courseMapper;
-    private final UserRepository userRepository;
     private final CourseSelectionRepository courseSelectionRepository;
     private final CourseSelectionMapper courseSelectionMapper;
-    private final CourseSelectionService courseSelectionService;
+    private final UserService userService;
     private final CoderService coderService;
     private final HelperService helperService;
     private final EvalService evalService;
 
-    public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, UserRepository userRepository, CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, CourseSelectionService courseSelectionService, CoderService coderService, HelperService helperService, EvalService evalService) {
+    public CourseService(CourseRepository courseRepository, CourseMapper courseMapper, CourseSelectionRepository courseSelectionRepository, CourseSelectionMapper courseSelectionMapper, CoderService coderService, HelperService helperService, EvalService evalService, UserService userService) {
         this.courseRepository = courseRepository;
         this.courseMapper = courseMapper;
-        this.userRepository = userRepository;
         this.courseSelectionRepository = courseSelectionRepository;
         this.courseSelectionMapper = courseSelectionMapper;
-        this.courseSelectionService = courseSelectionService;
+        this.userService = userService;
         this.coderService = coderService;
         this.helperService = helperService;
         this.evalService = evalService;
     }
 
-    public CourseVO getCourse(Long courseId) {
-        Optional<Course> course = courseRepository.findById(courseId);
-        return course.map(courseMapper::courseToCourseVO).orElse(null);
-    }
-
     public CourseVO createCourse(CourseVO courseVO) {
-        Integer coderId;
+//        Integer coderId;
 
         // 确认授课教师
-        Optional<User> teacher = userRepository.findById(courseVO.getTeacher().getId());
-        if (!teacher.isPresent()) {
-            throw new CustomErrorException("课程教师不存在");
-        }
-        if (!teacher.get().getRole().equals(UserRole.TEACHER) && !teacher.get().getRole().equals(UserRole.ADMIN)) {
-            throw new CustomErrorException("仅限管理员和教师创建课程");
+        UserVO teacher = userService.findUserById(courseVO.getTeacher().getId());
+        List<UserRole> teacherRoles = new ArrayList<>();
+        teacherRoles.add(UserRole.TEACHER);
+        if (!teacherRoles.contains(teacher.getRole())) {
+            throw new CustomErrorException("当前用户无权创建课程");
         }
 
         // todo: 创建Coder课程
@@ -84,34 +68,27 @@ public class CourseService {
     }
 
     public CourseVO updateCourse(CourseVO courseVO) {
-        Optional<Course> optionalCourse = courseRepository.findById(courseVO.getId());
-        if(!optionalCourse.isPresent()){
-            throw new CustomErrorException("原课程不存在");
-        }
-        if(!courseVO.getTeacher().getId().equals(optionalCourse.get().getTeacherId())){
-            throw new CustomErrorException("当前用户无权修改课程信息");
+        CourseVO originalCourse = this.getCourseById(courseVO.getId());
+        if (!courseVO.getTeacher().getId().equals(originalCourse.getTeacher().getId())) {
+            throw new CustomErrorException("当前用户无权修改课程");
         }
         Course course = courseMapper.courseVOToCourse(courseVO);
-        course.setCreatedTime(optionalCourse.get().getCreatedTime());
-        course.setState(optionalCourse.get().getState());
+        course.setCreatedTime(originalCourse.getCreatedTime());
+        course.setState(originalCourse.getState());
         Course result = courseRepository.save(course);
         return courseMapper.courseToCourseVO(result);
     }
 
     // 伪删除
     public String deleteCourse(Long courseId, Long userId) {
-        Optional<Course> optionalCourse = courseRepository.findById(courseId);
-        if (!optionalCourse.isPresent()) {
-            throw new CustomErrorException("原课程不存在");
-        }
-        Course course = optionalCourse.get();
-        if (!userId.equals(course.getTeacherId())){
+        CourseVO course = this.getCourseById(courseId);
+        if (!userId.equals(course.getTeacher().getId())) {
             throw new CustomErrorException("当前用户无权删除课程");
         }
         List<CourseSelection> courseSelectionList = courseSelectionRepository.findCourseSelectionsByCourseId(courseId);
-        courseSelectionList.forEach(courseSelection -> courseSelectionService.cancelCourseSelection(courseSelectionMapper.toCourseSelectionVO(courseSelection)));
+        courseSelectionList.forEach(courseSelection -> this.cancelCourseSelection(courseSelectionMapper.toCourseSelectionVO(courseSelection)));
         course.setState(ObjectState.DELETED);
-        courseRepository.save(course);
+        courseRepository.save(courseMapper.courseVOToCourse(course));
         return "课程删除成功";
     }
 
@@ -134,23 +111,58 @@ public class CourseService {
     public List<CourseVO> getStudentCourses(Long studentId) {
         List<CourseSelection> courseSelections = courseSelectionRepository.findCourseSelectionsByUserId(studentId);
         return courseSelections.stream()
-                .map(courseSelection -> courseMapper.courseToCourseVO(courseRepository.findById(courseSelection.getCourseId()).get()))
-                .filter(courseVO -> !courseVO.getState().equals(ObjectState.DELETED))
+                .map(courseSelection -> this.getCourseById(courseSelection.getCourseId()))
+                .filter(course -> !course.getState().equals(ObjectState.DELETED))
                 .collect(Collectors.toList());
     }
 
-    public List<CourseVO> getExampleCourses(){
+    public List<CourseVO> getExampleCourses() {
         List<Course> courses = courseRepository.findCoursesByState(ObjectState.EXAMPLE);
-        return courses.stream().map(courseMapper::courseToCourseVO).collect(Collectors.toList());
+        return courses.stream()
+                .map(courseMapper::courseToCourseVO)
+                .collect(Collectors.toList());
     }
 
-    public CourseVO getCourseByCoderId(Integer coderId){
-        Optional<Course> optionalCourse = courseRepository.findCourseByCoderId(coderId);
-        return optionalCourse.map(courseMapper::courseToCourseVO).orElse(null);
+    public CourseVO getCourseByCoderId(Integer coderId) {
+        Course course = courseRepository.findCourseByCoderId(coderId).orElseThrow(CustomErrorException::courseNotFound);
+        return courseMapper.courseToCourseVO(course);
+    }
+
+    public Boolean checkCourseNameUnique(Long id, String name) {
+        Course course = courseRepository.findCourseByName(name).orElse(null);
+        return course == null || course.getId().equals(id);
+    }
+
+    public CourseVO getCourseById(Long id) {
+        Course course = courseRepository.findById(id).orElseThrow(CustomErrorException::courseNotFound);
+        return courseMapper.courseToCourseVO(course);
+    }
+
+    public String confirmCourseSelection(CourseSelectionVO courseSelectionVO) {
+        userService.findUserById(courseSelectionVO.getUserId());
+        this.getCourseById(courseSelectionVO.getCourseId());
+        CourseSelection courseSelection = courseSelectionMapper.toCourseSelection(courseSelectionVO);
+        courseSelection.setState(true);
+        courseSelectionRepository.save(courseSelection);
+        return "选课成功";
+    }
+
+    public String cancelCourseSelection(CourseSelectionVO courseSelectionVO) {
+        CourseSelection record = courseSelectionRepository.findById(courseSelectionMapper.toCourseSelectionKey(courseSelectionVO)).orElseThrow(CustomErrorException::courseSelectionNotFound);
+        if (record.getState()) {
+            record.setState(false);
+            courseSelectionRepository.save(record);
+            return "选课记录已删除";
+        } else {
+            throw CustomErrorException.courseSelectionNotFound();
+        }
     }
 
-    public Boolean checkCourseNameUnique(Long id, String name){
-        Optional<Course> optionalCourse = courseRepository.findCourseByName(name);
-        return !(optionalCourse.isPresent() && !optionalCourse.get().getId().equals(id));
+    public Boolean checkSelection(Long userId, Long courseId) {
+        CourseSelectionKey key = new CourseSelectionKey();
+        key.setUserId(userId);
+        key.setCourseId(courseId);
+        CourseSelection record = courseSelectionRepository.findById(key).orElse(null);
+        return record != null && record.getState();
     }
 }

+ 2 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/HttpService.java

@@ -63,8 +63,9 @@ public class HttpService {
     }
 
     public String getToken() {
+        String token;
         HttpServletRequest httpServletRequest = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        String token = Optional.ofNullable(httpServletRequest.getHeader("Authorization")).orElseThrow(() -> new PortalException(ExceptionType.UNAUTHORIZED, "缺少Token"));
+        token = Optional.ofNullable(httpServletRequest.getHeader("Authorization")).orElseThrow(() -> new PortalException(ExceptionType.UNAUTHORIZED, "缺少Token"));
         return token;
     }
 }

+ 35 - 45
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java

@@ -1,5 +1,6 @@
 package cn.seecoder.seecoderportalserver.service;
 
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementVO;
 import cn.seecoder.seecoderportalcommon.vo.MessageVO;
 import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalcommon.vo.ObjectType;
@@ -8,10 +9,7 @@ import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.Message;
 import cn.seecoder.seecoderportalserver.domain.User;
 import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
-import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
-import cn.seecoder.seecoderportalserver.repository.CourseRepository;
 import cn.seecoder.seecoderportalserver.repository.MessageRepository;
-import cn.seecoder.seecoderportalserver.repository.UserRepository;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import org.springframework.stereotype.Service;
 
@@ -21,42 +19,42 @@ import java.util.Optional;
 public class MessageService {
     private final MessageRepository messageRepository;
     private final MessageMapper messageMapper;
-    private final UserRepository userRepository;
-    private final AnnouncementRepository announcementRepository;
-    private final CourseRepository courseRepository;
+    private final UserService userService;
+    private final AnnouncementService announcementService;
+    private final CourseService courseService;
 
 
-    public MessageService(MessageRepository messageRepository, MessageMapper messageMapper, UserRepository userRepository, AnnouncementRepository announcementRepository, CourseRepository courseRepository) {
+    public MessageService(MessageRepository messageRepository, MessageMapper messageMapper, UserService userService, AnnouncementService announcementService, CourseService courseService) {
         this.messageRepository = messageRepository;
         this.messageMapper = messageMapper;
-        this.userRepository = userRepository;
-        this.announcementRepository = announcementRepository;
-        this.courseRepository = courseRepository;
+        this.userService = userService;
+        this.announcementService = announcementService;
+        this.courseService = courseService;
     }
 
-    private Boolean verifyTarget(ObjectType type, Long id) {
+    private void verifyTarget(ObjectType type, Long id) {
         switch (type) {
             case ANNOUNCEMENT:
-                Optional<Announcement> optionalAnnouncement = announcementRepository.findById(id);
-                return optionalAnnouncement.isPresent();
+                announcementService.getAnnouncementById(id);
+                break;
             case COURSE:
-                Optional<Course> optionalCourse = courseRepository.findById(id);
-                return optionalCourse.isPresent();
+                courseService.getCourseById(id);
+                break;
             case COMMENT:
-                Optional<Message> comment = messageRepository.findById(id);
-                return comment.isPresent();
+                this.getMessageById(id);
+                break;
             default:
-                return false;
+                break;
         }
+
     }
 
     public MessageVO create(MessageVO messageVO) {
-        Optional<User> sender = userRepository.findById(messageVO.getSender().getId());
-        if (!sender.isPresent()) {
-            throw new CustomErrorException("消息发送者不存在");
-        }
-        if (!verifyTarget(messageVO.getTargetType(), messageVO.getTargetId())){
-            throw new CustomErrorException("消息目标不存在");
+        userService.findUserById(messageVO.getSender().getId());
+        try{
+            this.verifyTarget(messageVO.getTargetType(), messageVO.getTargetId());
+        }catch (CustomErrorException e){
+            throw CustomErrorException.messageTargetNotFound();
         }
         Message message = messageMapper.toMessage(messageVO);
         Message result = messageRepository.save(message);
@@ -64,39 +62,31 @@ public class MessageService {
     }
 
     public String delete(Long id, Long userId) {
-        Optional<Message> optionalMessage = messageRepository.findById(id);
-        if (!optionalMessage.isPresent()) {
-            throw new CustomErrorException("该消息不存在");
-        }
-        Message message = optionalMessage.get();
-        if (!message.getSenderId().equals(userId)) {
-            throw new CustomErrorException("用户无权删除消息");
+        MessageVO message = this.getMessageById(id);
+        if (!message.getSender().getId().equals(userId)) {
+            throw new CustomErrorException("当前用户无权删除消息");
         }
         message.setState(ObjectState.DELETED);
-        messageRepository.save(message);
+        messageRepository.save(messageMapper.toMessage(message));
         return "消息删除成功";
     }
 
     public MessageVO update(MessageVO messageVO) {
-        Optional<Message> oldMessage = messageRepository.findById(messageVO.getId());
-        if(!oldMessage.isPresent()){
-            throw new CustomErrorException("原消息不存在");
+        MessageVO originalMessage = this.getMessageById(messageVO.getId());
+        try{
+            this.verifyTarget(messageVO.getTargetType(), messageVO.getTargetId());
+        }catch (CustomErrorException e){
+            throw CustomErrorException.messageTargetNotFound();
         }
-        if (!verifyTarget(messageVO.getTargetType(), messageVO.getTargetId())){
-            throw new CustomErrorException("消息目标不存在");
-        }
-        if(!oldMessage.get().getSenderId().equals(messageVO.getSender().getId())){
-            throw new CustomErrorException("用户无权修改消息");
+        if (!originalMessage.getSender().getId().equals(messageVO.getSender().getId())) {
+            throw new CustomErrorException("当前用户无权修改消息");
         }
         Message result = messageRepository.save(messageMapper.toMessage(messageVO));
         return messageMapper.toMessageVO(result);
     }
 
     public MessageVO getMessageById(Long id) {
-        Optional<Message> optionalMessage = messageRepository.findById(id);
-        if (!optionalMessage.isPresent()) {
-            throw new CustomErrorException("消息不存在");
-        }
-        return messageMapper.toMessageVO(optionalMessage.get());
+        Message message = messageRepository.findById(id).orElseThrow(CustomErrorException::messageNotFound);
+        return messageMapper.toMessageVO(message);
     }
 }

+ 20 - 4
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CourseController.java

@@ -1,5 +1,6 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 
+import cn.seecoder.seecoderportalcommon.vo.CourseSelectionVO;
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.service.CourseService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
@@ -14,9 +15,9 @@ public class CourseController {
 
     public CourseController(CourseService courseService) {this.courseService = courseService;}
 
-    @GetMapping
-    public OkResponse<CourseVO> getCourse(@RequestParam Long courseId) {
-        return OkResponse.of(courseService.getCourse(courseId));
+    @GetMapping("/getCourseById")
+    public OkResponse<CourseVO> getCourseById(@RequestParam Long id) {
+        return OkResponse.of(courseService.getCourseById(id));
     }
 
     @PostMapping("/create")
@@ -62,5 +63,20 @@ public class CourseController {
     @GetMapping("/checkName")
     public OkResponse<Boolean> checkCourseNameUnique(@RequestParam Long id, @RequestParam String name){
         return OkResponse.of(courseService.checkCourseNameUnique(id, name));
-    };
+    }
+
+    @PostMapping("/selection/confirm")
+    public OkResponse<String> confirm(@RequestBody CourseSelectionVO courseSelectionVO){
+        return OkResponse.of(courseService.confirmCourseSelection(courseSelectionVO));
+    }
+
+    @PostMapping("/selection/cancel")
+    public OkResponse<String> cancel(@RequestBody CourseSelectionVO courseSelectionVO){
+        return OkResponse.of(courseService.cancelCourseSelection(courseSelectionVO));
+    }
+
+    @GetMapping("/selection/checkSelection")
+    public OkResponse<Boolean> checkSelection(@RequestParam Long userId, @RequestParam Long courseId) {
+        return OkResponse.of(courseService.checkSelection(userId, courseId));
+    }
 }

+ 0 - 29
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/CourseSelectionController.java

@@ -1,29 +0,0 @@
-package cn.seecoder.seecoderportalserver.web.rest;
-
-import cn.seecoder.seecoderportalcommon.vo.CourseSelectionVO;
-import cn.seecoder.seecoderportalserver.service.CourseSelectionService;
-import cn.seecoder.seecoderportalserver.utility.OkResponse;
-import org.springframework.web.bind.annotation.*;
-
-@RestController()
-@RequestMapping("/api/course/selection")
-public class CourseSelectionController {
-    private final CourseSelectionService courseSelectionService;
-
-    public CourseSelectionController(CourseSelectionService courseSelectionService) {this.courseSelectionService = courseSelectionService;}
-
-    @PostMapping("/confirm")
-    public OkResponse<String> confirm(@RequestBody CourseSelectionVO courseSelectionVO){
-        return OkResponse.of(courseSelectionService.confirmCourseSelection(courseSelectionVO));
-    }
-
-    @PostMapping("/cancel")
-    public OkResponse<String> cancel(@RequestBody CourseSelectionVO courseSelectionVO){
-        return OkResponse.of(courseSelectionService.cancelCourseSelection(courseSelectionVO));
-    }
-
-    @GetMapping("/checkSelection")
-    public OkResponse<Boolean> checkSelection(@RequestParam Long userId, @RequestParam Long courseId) {
-        return OkResponse.of(courseSelectionService.checkSelection(userId, courseId));
-    }
-}

+ 17 - 15
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/errors/CustomErrorException.java

@@ -24,25 +24,27 @@ public class CustomErrorException extends RuntimeException {
         return message;
     }
 
-    public static CustomErrorException userIdNotFound(){
-        return new CustomErrorException("用户id不存在");
-    }
+    public static CustomErrorException userIdNotFound() {return new CustomErrorException("用户id不存在");}
 
-    public static CustomErrorException superRoleNotFound() {
-        return new CustomErrorException("超级用户或申请不存在");
-    }
+    public static CustomErrorException superRoleNotFound() {return new CustomErrorException("超级用户或申请不存在");}
 
-    public static CustomErrorException phoneVerificationNotMatch() {
-        return new CustomErrorException("验证码错误");
-    }
+    public static CustomErrorException phoneVerificationNotMatch() {return new CustomErrorException("验证码错误");}
 
-    public static CustomErrorException phoneAlreadyExist() { return new CustomErrorException("手机号已存在"); }
+    public static CustomErrorException phoneAlreadyExist() {return new CustomErrorException("手机号已存在");}
 
-    public static CustomErrorException usernameAlreadyExist() { return new CustomErrorException("用户名已存在"); }
+    public static CustomErrorException usernameAlreadyExist() {return new CustomErrorException("用户名已存在");}
 
-    public static CustomErrorException emailAlreadyExist() { return new CustomErrorException("邮箱已存在"); }
+    public static CustomErrorException emailAlreadyExist() {return new CustomErrorException("邮箱已存在");}
 
-    public static CustomErrorException domainNotAllowed() {
-        return new CustomErrorException("地址是非法地址");
-    }
+    public static CustomErrorException domainNotAllowed() {return new CustomErrorException("地址是非法地址");}
+
+    public static CustomErrorException courseNotFound() {return new CustomErrorException("课程不存在");}
+
+    public static CustomErrorException courseSelectionNotFound() {return new CustomErrorException("选课记录不存在");}
+
+    public static CustomErrorException announcementNotFound() {return new CustomErrorException("公告不存在");}
+
+    public static CustomErrorException messageNotFound(){return new CustomErrorException("消息不存在");}
+
+    public static CustomErrorException messageTargetNotFound() {return new CustomErrorException("消息目标不存在");}
 }