Browse Source

feat: 未读公告小红点

mjh 4 years ago
parent
commit
ab5e82adeb

+ 11 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/AnnouncementVO.java

@@ -19,6 +19,8 @@ public class AnnouncementVO {
 
     private AnnouncementType type;
 
+    private Boolean read;
+
     public Long getId() {
         return id;
     }
@@ -83,6 +85,14 @@ public class AnnouncementVO {
         this.type = type;
     }
 
+    public Boolean getRead() {
+        return read;
+    }
+
+    public void setRead(Boolean read) {
+        this.read = read;
+    }
+
     @Override
     public String toString() {
         return "AnnouncementVO{" +
@@ -94,6 +104,7 @@ public class AnnouncementVO {
                 ", createdAt=" + createdAt +
                 ", state=" + state +
                 ", type=" + type +
+                ", read=" + read +
                 '}';
     }
 }

+ 22 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java

@@ -4,6 +4,8 @@ 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.security.DomainUserDetails;
+import cn.seecoder.seecoderportalserver.security.SecurityUtils;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import cn.seecoder.seecoderportalserver.web.rest.errors.ExceptionType;
 import cn.seecoder.seecoderportalserver.web.rest.errors.PortalException;
@@ -70,16 +72,24 @@ public class AnnouncementService {
 
     public AnnouncementVO getAnnouncementById(Long id) {
         Announcement announcement = announcementRepository.findById(id).orElseThrow(CustomErrorException::announcementNotFound);
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
+        AnnouncementVO result = announcementMapper.toAnnouncementVO(announcement);
+        result.setRead(userService.isTeacher(user.getRole()) || this.getReadState(id, user.getId()));
         return announcementMapper.toAnnouncementVO(announcement);
     }
 
     public List<AnnouncementVO> getAnnouncementsByCourseId(Long courseId) {
         courseService.getCourseById(courseId);
+        DomainUserDetails user = SecurityUtils.getCurrentUser();
         List<Announcement> announcementList = announcementRepository.findAnnouncementsByCourseId(courseId);
-        return announcementList.stream()
+        List<AnnouncementVO> result = announcementList.stream()
                 .filter(announcement -> announcement.getState() != ObjectState.DELETED)
                 .map(announcementMapper::toAnnouncementVO)
                 .collect(Collectors.toList());
+        result.forEach(announcementVO -> {
+            announcementVO.setRead(userService.isTeacher(user.getRole()) || this.getReadState(announcementVO.getId(), user.getId()));
+        });
+        return result;
     }
 
     public List<AnnouncementVO> getUnreadAnnouncementsByUserId(Long userId) {
@@ -110,7 +120,17 @@ public class AnnouncementService {
             return announcementList.stream()
                     .map(this::getAnnouncementById)
                     .collect(Collectors.toList());
+        }else{
+            return new ArrayList<>();
+        }
+    }
+
+    public Boolean getReadState(Long id, Long userId) {
+        AnnouncementRecord record = announcementRecordRepository.findById(new AnnouncementRecordKey(id, userId)).orElse(null);
+        if (record == null) {
+            return false;
+        } else {
+            return record.getState();
         }
-        return null;
     }
 }