Преглед изворни кода

feat: 学生登录首页后将拉取自己尚未阅读的公告

mjh пре 4 година
родитељ
комит
451bc00466

+ 41 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementRecordKey.java

@@ -0,0 +1,41 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+import java.io.Serializable;
+
+public class AnnouncementRecordKey implements Serializable {
+    private Long announcementId;
+
+    private Long recipientId;
+
+    public Long getAnnouncementId() {
+        return announcementId;
+    }
+
+    public void setAnnouncementId(Long announcementId) {
+        this.announcementId = announcementId;
+    }
+
+    public Long getRecipientId() {
+        return recipientId;
+    }
+
+    public void setRecipientId(Long recipientId) {
+        this.recipientId = recipientId;
+    }
+
+    public AnnouncementRecordKey() {
+    }
+
+    public AnnouncementRecordKey(Long announcementId, Long recipientId) {
+        this.announcementId = announcementId;
+        this.recipientId = recipientId;
+    }
+
+    @Override
+    public String toString() {
+        return "AnnouncementRecordKey{" +
+                "announcementId=" + announcementId +
+                ", recipientId=" + recipientId +
+                '}';
+    }
+}

+ 8 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseSelectionKey.java

@@ -23,6 +23,14 @@ public class CourseSelectionKey implements Serializable {
         this.courseId = courseId;
     }
 
+    public CourseSelectionKey() {
+    }
+
+    public CourseSelectionKey(Long userId, Long courseId) {
+        this.userId = userId;
+        this.courseId = courseId;
+    }
+
     @Override
     public String toString() {
         return "CourseSelectionKey{" +

+ 0 - 42
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseSelectionVO.java

@@ -1,42 +0,0 @@
-package cn.seecoder.seecoderportalcommon.vo;
-
-public class CourseSelectionVO {
-    private Long userId;
-
-    private Long courseId;
-
-    private Boolean state;
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
-    public Boolean getState() {
-        return state;
-    }
-
-    public void setState(Boolean state) {
-        this.state = state;
-    }
-
-    @Override
-    public String toString() {
-        return "CourseSelectionVO{" +
-                "userId=" + userId +
-                ", courseId=" + courseId +
-                ", state=" + state +
-                '}';
-    }
-}

+ 12 - 9
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/AnnouncementRecord.java

@@ -1,20 +1,21 @@
 package cn.seecoder.seecoderportalserver.domain;
 
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementRecordKey;
+
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.time.OffsetDateTime;
 
 @Entity
+@IdClass(AnnouncementRecordKey.class)
 @Table(name = "announcement_record")
 public class AnnouncementRecord {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-
     @Column
     @NotNull
     private Long announcementId;
 
+    @Id
     @Column
     @NotNull
     private Long recipientId;
@@ -30,12 +31,15 @@ public class AnnouncementRecord {
     @Column
     private OffsetDateTime readAt;
 
-    public Long getId() {
-        return id;
+    public AnnouncementRecord() {
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public AnnouncementRecord(Long announcementId, Long recipientId, OffsetDateTime createdAt, Boolean state, OffsetDateTime readAt) {
+        this.announcementId = announcementId;
+        this.recipientId = recipientId;
+        this.createdAt = createdAt;
+        this.state = state;
+        this.readAt = readAt;
     }
 
     public Long getAnnouncementId() {
@@ -81,8 +85,7 @@ public class AnnouncementRecord {
     @Override
     public String toString() {
         return "AnnouncementRecord{" +
-                "id=" + id +
-                ", announcementId=" + announcementId +
+                "announcementId=" + announcementId +
                 ", recipientId=" + recipientId +
                 ", createdAt=" + createdAt +
                 ", state=" + state +

+ 8 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/CourseSelection.java

@@ -23,6 +23,14 @@ public class CourseSelection {
     @NotNull
     private Boolean state;
 
+    public CourseSelection() {
+    }
+
+    public CourseSelection(CourseSelectionKey key) {
+        this.userId = key.getUserId();
+        this.courseId = key.getCourseId();
+    }
+
     public Long getUserId() {
         return userId;
     }

+ 0 - 16
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/CourseSelectionMapper.java

@@ -1,16 +0,0 @@
-package cn.seecoder.seecoderportalserver.mapper;
-
-
-import cn.seecoder.seecoderportalcommon.vo.CourseSelectionVO;
-import cn.seecoder.seecoderportalserver.domain.CourseSelection;
-import cn.seecoder.seecoderportalcommon.vo.CourseSelectionKey;
-import org.mapstruct.Mapper;
-
-@Mapper(componentModel = "spring")
-public interface CourseSelectionMapper {
-    CourseSelection toCourseSelection(CourseSelectionVO courseSelectionVO);
-
-    CourseSelectionVO toCourseSelectionVO(CourseSelection courseSelection);
-
-    CourseSelectionKey toCourseSelectionKey(CourseSelectionVO courseSelectionVO);
-}

+ 12 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/AnnouncementRecordRepository.java

@@ -0,0 +1,12 @@
+package cn.seecoder.seecoderportalserver.repository;
+
+import cn.seecoder.seecoderportalcommon.vo.AnnouncementRecordKey;
+import cn.seecoder.seecoderportalserver.domain.AnnouncementRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+public interface AnnouncementRecordRepository extends JpaRepository<AnnouncementRecord, AnnouncementRecordKey> {
+    List<AnnouncementRecord> findAnnouncementRecordsByRecipientId(@NotNull Long recipientId);
+}

+ 38 - 6
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -1,10 +1,9 @@
 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.seecoderportalcommon.vo.*;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
+import cn.seecoder.seecoderportalserver.domain.AnnouncementRecord;
+import cn.seecoder.seecoderportalserver.repository.AnnouncementRecordRepository;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
 import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
@@ -12,18 +11,22 @@ import cn.seecoder.seecoderportalserver.mapper.AnnouncementMapper;
 import cn.seecoder.seecoderportalserver.repository.AnnouncementRepository;
 import org.springframework.stereotype.Service;
 
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
 public class AnnouncementService {
     private final AnnouncementRepository announcementRepository;
+    private final AnnouncementRecordRepository announcementRecordRepository;
     private final AnnouncementMapper announcementMapper;
     private final CourseService courseService;
     private final UserService userService;
 
-    public AnnouncementService(AnnouncementRepository announcementRepository, AnnouncementMapper announcementMapper, CourseService courseService, UserService userService) {
+    public AnnouncementService(AnnouncementRepository announcementRepository, AnnouncementRecordRepository announcementRecordRepository, AnnouncementMapper announcementMapper, CourseService courseService, UserService userService) {
         this.announcementRepository = announcementRepository;
+        this.announcementRecordRepository = announcementRecordRepository;
         this.announcementMapper = announcementMapper;
         this.courseService = courseService;
         this.userService = userService;
@@ -70,11 +73,40 @@ public class AnnouncementService {
         return announcementMapper.toAnnouncementVO(announcement);
     }
 
-    public List<AnnouncementVO> getAnnouncementsByCourseID(Long courseId){
+    public List<AnnouncementVO> getAnnouncementsByCourseId(Long courseId) {
         courseService.getCourseById(courseId);
         List<Announcement> announcementList = announcementRepository.findAnnouncementsByCourseId(courseId);
         return announcementList.stream()
                 .map(announcementMapper::toAnnouncementVO)
                 .collect(Collectors.toList());
     }
+
+    public List<AnnouncementVO> getUnreadAnnouncementsByUserId(Long userId) {
+        UserVO user = userService.findUserById(userId);
+        if (userService.isStudent(user.getRole())) {
+            // 学生收取已选课程的公告
+            List<Long> announcementList = new ArrayList<>();
+            courseService.getStudentCourses(userId).stream().map(CourseVO::getId)
+                    .map(courseId -> this.getAnnouncementsByCourseId(courseId).stream().map(AnnouncementVO::getId).collect(Collectors.toList()))
+                    .collect(Collectors.toList())
+                    .forEach(announcementList::addAll);
+            List<AnnouncementRecord> recordAnnouncements = announcementRecordRepository.findAnnouncementRecordsByRecipientId(userId);
+            List<Long> recordButUnread = new ArrayList<>();
+
+            recordAnnouncements.forEach(announcementRecord -> {
+                announcementList.remove(announcementRecord.getAnnouncementId());
+                if (!announcementRecord.getState()) {
+                    recordButUnread.add(announcementRecord.getAnnouncementId());
+                }
+            });
+            for (Long announcementId : announcementList) {
+                announcementRecordRepository.save(new AnnouncementRecord(announcementId, userId, OffsetDateTime.now(), false, null));
+            }
+            announcementList.addAll(recordButUnread);
+            return announcementList.stream()
+                    .map(this::getAnnouncementById)
+                    .collect(Collectors.toList());
+        }
+        return null;
+    }
 }

+ 9 - 15
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -3,7 +3,6 @@ package cn.seecoder.seecoderportalserver.service;
 import cn.seecoder.seecoderportalcommon.vo.*;
 import cn.seecoder.seecoderportalserver.domain.Course;
 import cn.seecoder.seecoderportalserver.domain.CourseSelection;
-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;
@@ -14,7 +13,6 @@ import cn.seecoder.seecoderportalserver.service.Impl.HelperService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,17 +22,15 @@ public class CourseService {
     private final CourseRepository courseRepository;
     private final CourseMapper courseMapper;
     private final CourseSelectionRepository courseSelectionRepository;
-    private final CourseSelectionMapper courseSelectionMapper;
     private final UserService userService;
     private final CoderService coderService;
     private final HelperService helperService;
     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.courseMapper = courseMapper;
         this.courseSelectionRepository = courseSelectionRepository;
-        this.courseSelectionMapper = courseSelectionMapper;
         this.userService = userService;
         this.coderService = coderService;
         this.helperService = helperService;
@@ -84,7 +80,7 @@ public class CourseService {
             throw new CustomErrorException("当前用户无权删除课程");
         }
         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);
         courseRepository.save(courseMapper.courseVOToCourse(course));
         return "课程删除成功";
@@ -136,17 +132,17 @@ public class CourseService {
         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);
         courseSelectionRepository.save(courseSelection);
         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()) {
             record.setState(false);
             courseSelectionRepository.save(record);
@@ -157,9 +153,7 @@ public class CourseService {
     }
 
     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);
         return record != null && record.getState();
     }

+ 8 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/AnnouncementController.java

@@ -35,7 +35,13 @@ public class AnnouncementController {
     }
 
     @GetMapping("/getAllByCourseId")
-    public OkResponse<List<AnnouncementVO>> getAnnouncementsByCourseId(@RequestParam Long courseId){
-        return OkResponse.of(announcementService.getAnnouncementsByCourseID(courseId));
+    public OkResponse<List<AnnouncementVO>> getAnnouncementsByCourseId(@RequestParam Long courseId) {
+        return OkResponse.of(announcementService.getAnnouncementsByCourseId(courseId));
     }
+
+    @GetMapping("/getUnreadByUserId")
+    public OkResponse<List<AnnouncementVO>> getUnreadAnnouncementsByUserId(@RequestParam Long userId) {
+        return OkResponse.of(announcementService.getUnreadAnnouncementsByUserId(userId));
+    }
+
 }

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

@@ -1,6 +1,6 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 
-import cn.seecoder.seecoderportalcommon.vo.CourseSelectionVO;
+import cn.seecoder.seecoderportalcommon.vo.CourseSelectionKey;
 import cn.seecoder.seecoderportalcommon.vo.CourseVO;
 import cn.seecoder.seecoderportalserver.service.CourseService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
@@ -66,13 +66,13 @@ public class CourseController {
     }
 
     @PostMapping("/selection/confirm")
-    public OkResponse<String> confirm(@RequestBody CourseSelectionVO courseSelectionVO){
-        return OkResponse.of(courseService.confirmCourseSelection(courseSelectionVO));
+    public OkResponse<String> confirm(@RequestBody CourseSelectionKey courseSelectionKey){
+        return OkResponse.of(courseService.confirmCourseSelection(courseSelectionKey));
     }
 
-    @PostMapping("/selection/cancel")
-    public OkResponse<String> cancel(@RequestBody CourseSelectionVO courseSelectionVO){
-        return OkResponse.of(courseService.cancelCourseSelection(courseSelectionVO));
+    @PutMapping("/selection/cancel")
+    public OkResponse<String> cancel(@RequestBody CourseSelectionKey courseSelectionKey){
+        return OkResponse.of(courseService.cancelCourseSelection(courseSelectionKey));
     }
 
     @GetMapping("/selection/checkSelection")