Przeglądaj źródła

feat: 根据课程获取评论以及用户获取自己未读的消息

mjh 4 lat temu
rodzic
commit
f755a5fde0
13 zmienionych plików z 311 dodań i 25 usunięć
  1. 41 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/MessageRecordKey.java
  2. 7 7
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/MessageVO.java
  3. 35 0
      seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/CourseMessageDTO.java
  4. 5 1
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/config/SpringSecurityConfiguration.java
  5. 15 2
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Message.java
  6. 93 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/MessageRecord.java
  7. 2 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/MessageMapperImpl.java
  8. 4 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/AnnouncementRepository.java
  9. 12 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/MessageRecordRepository.java
  10. 10 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/MessageRepository.java
  11. 6 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/AnnouncementService.java
  12. 68 15
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java
  13. 13 0
      seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/MessageController.java

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

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

+ 7 - 7
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/MessageVO.java

@@ -13,6 +13,8 @@ public class MessageVO {
 
     private Long targetId;
 
+    private Long mntId;
+
     private Object target;
 
     private String content;
@@ -21,8 +23,6 @@ public class MessageVO {
 
     private ObjectState state;
 
-    private Boolean read;
-
     public Long getId() {
         return id;
     }
@@ -95,12 +95,12 @@ public class MessageVO {
         this.targetId = targetId;
     }
 
-    public Boolean getRead() {
-        return read;
+    public Long getMntId() {
+        return mntId;
     }
 
-    public void setRead(Boolean read) {
-        this.read = read;
+    public void setMntId(Long mntId) {
+        this.mntId = mntId;
     }
 
     @Override
@@ -111,11 +111,11 @@ public class MessageVO {
                 ", actionType=" + actionType +
                 ", targetType=" + targetType +
                 ", targetId=" + targetId +
+                ", mntId=" + mntId +
                 ", target=" + target +
                 ", content='" + content + '\'' +
                 ", createdAt=" + createdAt +
                 ", state=" + state +
-                ", read=" + read +
                 '}';
     }
 }

+ 35 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/CourseMessageDTO.java

@@ -0,0 +1,35 @@
+package cn.seecoder.seecoderportalcommon.vo.dto;
+
+import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+
+import java.util.List;
+
+public class CourseMessageDTO {
+    private MessageVO mainMessage;
+
+    private List<MessageVO> children;
+
+    public MessageVO getMainMessage() {
+        return mainMessage;
+    }
+
+    public void setMainMessage(MessageVO mainMessage) {
+        this.mainMessage = mainMessage;
+    }
+
+    public List<MessageVO> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<MessageVO> children) {
+        this.children = children;
+    }
+
+    public CourseMessageDTO(MessageVO mainMessage) {
+        this.mainMessage = mainMessage;
+    }
+
+    public void addChild(MessageVO messageVO){
+        this.children.add(messageVO);
+    }
+}

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

@@ -84,7 +84,11 @@ public class SpringSecurityConfiguration extends WebSecurityConfigurerAdapter {
                         "/api/coder/exam/recommend",
                         "/api/announcement",
                         "/api/announcement/getAllByCourseId",
-                        "/api/announcement/getUnreadByUserId")
+                        "/api/announcement/getUnreadByUserId",
+                        "/api/message",
+                        "/api/message/getUnreadByUser",
+                        "/api/message/getByCourseId"
+                        )
                 .permitAll() // authenticate
                 .and()
                 .authorizeRequests()

+ 15 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Message.java

@@ -33,6 +33,10 @@ public class Message {
     @NotNull
     private Long targetId;
 
+    @Column
+    @NotNull
+    private Long mntId;
+
     @Column
     @NotNull
     private String content;
@@ -110,15 +114,24 @@ public class Message {
         this.state = state;
     }
 
+    public Long getMntId() {
+        return mntId;
+    }
+
+    public void setMntId(Long mntId) {
+        this.mntId = mntId;
+    }
+
     @Override
     public String toString() {
-        return "Comment{" +
+        return "Message{" +
                 "id=" + id +
                 ", senderId=" + senderId +
                 ", actionType=" + actionType +
                 ", targetType=" + targetType +
                 ", targetId=" + targetId +
-                ", content=" + content +
+                ", mntId=" + mntId +
+                ", content='" + content + '\'' +
                 ", createdAt=" + createdAt +
                 ", state=" + state +
                 '}';

+ 93 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/MessageRecord.java

@@ -1,4 +1,97 @@
 package cn.seecoder.seecoderportalserver.domain;
 
+
+import cn.seecoder.seecoderportalcommon.vo.MessageRecordKey;
+import org.hibernate.validator.constraints.br.CPF;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.time.OffsetDateTime;
+
+@Entity
+@IdClass(MessageRecordKey.class)
+@Table(name = "message_record")
 public class MessageRecord {
+    @Id
+    @Column
+    @NotNull
+    private Long messageId;
+
+    @Id
+    @Column
+    @NotNull
+    private Long recipientId;
+
+    @Column
+    @NotNull
+    private OffsetDateTime createdAt;
+
+    @Column
+    @NotNull
+    private Boolean state;
+
+    @Column
+    private OffsetDateTime readAt;
+
+    public MessageRecord() {
+    }
+
+    public MessageRecord(Long messageId, Long recipientId, OffsetDateTime createdAt, Boolean state, OffsetDateTime readAt) {
+        this.messageId = messageId;
+        this.recipientId = recipientId;
+        this.createdAt = createdAt;
+        this.state = state;
+        this.readAt = readAt;
+    }
+
+    public Long getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(Long messageId) {
+        this.messageId = messageId;
+    }
+
+    public Long getRecipientId() {
+        return recipientId;
+    }
+
+    public void setRecipientId(Long recipientId) {
+        this.recipientId = recipientId;
+    }
+
+    public OffsetDateTime getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(OffsetDateTime createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Boolean getState() {
+        return state;
+    }
+
+    public void setState(Boolean state) {
+        this.state = state;
+    }
+
+    public OffsetDateTime getReadAt() {
+        return readAt;
+    }
+
+    public void setReadAt(OffsetDateTime readAt) {
+        this.readAt = readAt;
+    }
+
+    @Override
+    public String toString() {
+        return "MessageRecord{" +
+                "messageId=" + messageId +
+                ", recipientId=" + recipientId +
+                ", createdAt=" + createdAt +
+                ", state=" + state +
+                ", readAt=" + readAt +
+                '}';
+    }
 }

+ 2 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/MessageMapperImpl.java

@@ -36,6 +36,7 @@ public class MessageMapperImpl implements MessageMapper {
         message.setActionType(messageVO.getActionType());
         message.setTargetType(messageVO.getTargetType());
         message.setTargetId(messageVO.getTargetId());
+        message.setMntId(messageVO.getMntId());
         message.setContent(messageVO.getContent());
         message.setCreatedAt(messageVO.getCreatedAt());
         message.setState(messageVO.getState());
@@ -68,6 +69,7 @@ public class MessageMapperImpl implements MessageMapper {
             default:
                 break;
         }
+        messageVO.setMntId(message.getMntId());
         messageVO.setContent(message.getContent());
         messageVO.setCreatedAt(message.getCreatedAt());
         messageVO.setState(message.getState());

+ 4 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/AnnouncementRepository.java

@@ -1,10 +1,14 @@
 package cn.seecoder.seecoderportalserver.repository;
 
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalserver.domain.Announcement;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 public interface AnnouncementRepository extends JpaRepository<Announcement, Long> {
     List<Announcement> findAnnouncementsByCourseId(Long courseId);
+
+    List<Announcement> findAnnouncementsBySenderIdAndStateNot(@NotNull Long senderId, @NotNull ObjectState state);
 }

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

@@ -0,0 +1,12 @@
+package cn.seecoder.seecoderportalserver.repository;
+
+import cn.seecoder.seecoderportalcommon.vo.MessageRecordKey;
+import cn.seecoder.seecoderportalserver.domain.Message;
+import cn.seecoder.seecoderportalserver.domain.MessageRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import javax.validation.constraints.NotNull;
+import java.util.Optional;
+
+public interface MessageRecordRepository extends JpaRepository<MessageRecord, MessageRecordKey> {
+}

+ 10 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/MessageRepository.java

@@ -1,7 +1,17 @@
 package cn.seecoder.seecoderportalserver.repository;
 
+import cn.seecoder.seecoderportalcommon.vo.ObjectState;
 import cn.seecoder.seecoderportalserver.domain.Message;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import javax.validation.constraints.NotNull;
+import java.time.OffsetDateTime;
+import java.util.List;
+
 public interface MessageRepository extends JpaRepository<Message, Long> {
+    List<Message> findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(@NotNull Long targetId, @NotNull OffsetDateTime createdAt, @NotNull ObjectState state);
+
+    List<Message> findMessagesByMntIdAndStateNot(@NotNull Long mntId, @NotNull ObjectState state);
+
+    List<Message> findMessagesBySenderIdAndStateNot(@NotNull Long senderId, @NotNull ObjectState state);
 }

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

@@ -139,4 +139,10 @@ public class AnnouncementService {
             return record.getState();
         }
     }
+
+    public List<AnnouncementVO> getAnnouncementsByUserId(Long userId) {
+        return announcementRepository.findAnnouncementsBySenderIdAndStateNot(userId, ObjectState.DELETED).stream()
+                .map(announcementMapper::toAnnouncementVO)
+                .collect(Collectors.toList());
+    }
 }

+ 68 - 15
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java

@@ -1,31 +1,32 @@
 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;
-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.seecoderportalcommon.vo.*;
+import cn.seecoder.seecoderportalcommon.vo.dto.CourseMessageDTO;
+import cn.seecoder.seecoderportalserver.domain.*;
 import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
+import cn.seecoder.seecoderportalserver.repository.MessageRecordRepository;
 import cn.seecoder.seecoderportalserver.repository.MessageRepository;
 import cn.seecoder.seecoderportalserver.web.rest.errors.CustomErrorException;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class MessageService {
     private final MessageRepository messageRepository;
+    private final MessageRecordRepository messageRecordRepository;
     private final MessageMapper messageMapper;
     private final UserService userService;
     private final AnnouncementService announcementService;
     private final CourseService courseService;
 
 
-    public MessageService(MessageRepository messageRepository, MessageMapper messageMapper, UserService userService, AnnouncementService announcementService, CourseService courseService) {
+    public MessageService(MessageRepository messageRepository, MessageRecordRepository messageRecordRepository, MessageMapper messageMapper, UserService userService, AnnouncementService announcementService, CourseService courseService) {
         this.messageRepository = messageRepository;
+        this.messageRecordRepository = messageRecordRepository;
         this.messageMapper = messageMapper;
         this.userService = userService;
         this.announcementService = announcementService;
@@ -50,12 +51,12 @@ public class MessageService {
     }
 
     public MessageVO create(MessageVO messageVO, Long userId) {
-        if(!messageVO.getSender().getId().equals(userId)){
+        if (!messageVO.getSender().getId().equals(userId)) {
             throw new CustomErrorException("当前用户无权创建消息");
         }
-        try{
+        try {
             this.verifyTarget(messageVO.getTargetType(), messageVO.getTargetId());
-        }catch (CustomErrorException e){
+        } catch (CustomErrorException e) {
             throw CustomErrorException.messageTargetNotFound();
         }
         Message message = messageMapper.toMessage(messageVO);
@@ -76,9 +77,9 @@ public class MessageService {
 
     public MessageVO update(MessageVO messageVO) {
         MessageVO originalMessage = this.getMessageById(messageVO.getId());
-        try{
+        try {
             this.verifyTarget(messageVO.getTargetType(), messageVO.getTargetId());
-        }catch (CustomErrorException e){
+        } catch (CustomErrorException e) {
             throw CustomErrorException.messageTargetNotFound();
         }
         if (!originalMessage.getSender().getId().equals(messageVO.getSender().getId())) {
@@ -92,4 +93,56 @@ public class MessageService {
         Message message = messageRepository.findById(id).orElseThrow(CustomErrorException::messageNotFound);
         return messageMapper.toMessageVO(message);
     }
+
+    public List<MessageVO> getUnreadMessagesByUserId(Long userId, Integer dayRange) {
+        OffsetDateTime startTime = OffsetDateTime.now().minusDays(dayRange);
+        List<MessageVO> result = new ArrayList<>();
+        for (Message message : messageRepository.findMessagesBySenderIdAndStateNot(userId, ObjectState.DELETED)) {
+            result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(message.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
+                    .stream()
+                    .map(messageMapper::toMessageVO)
+                    .collect(Collectors.toList()));
+        }
+        if (userService.isTeacher(userService.findUserById(userId).getRole())) {
+            for (CourseVO courseVO : courseService.getTeacherCourses(userId)) {
+                result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(courseVO.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
+                        .stream()
+                        .map(messageMapper::toMessageVO)
+                        .collect(Collectors.toList()));
+            }
+            for (AnnouncementVO announcementVO : announcementService.getAnnouncementsByUserId(userId)) {
+                result.addAll(messageRepository.findMessagesByTargetIdAndCreatedAtIsAfterAndStateNot(announcementVO.getId(), startTime.minusDays(dayRange), ObjectState.DELETED)
+                        .stream()
+                        .map(messageMapper::toMessageVO)
+                        .collect(Collectors.toList()));
+            }
+        }
+        result.stream()
+                .filter(messageVO -> {
+                    MessageRecord record = messageRecordRepository.findById(new MessageRecordKey(messageVO.getId(), userId)).orElse(null);
+                    if (record == null) {
+                        messageRecordRepository.save(new MessageRecord(messageVO.getId(), userId, OffsetDateTime.now(), false, null));
+                        return true;
+                    } else {
+                        return !record.getState();
+                    }
+                })
+                .collect(Collectors.toList());
+        return result;
+    }
+
+    public List<CourseMessageDTO> getMessagesByCourseId(Long courseId, Long userId) {
+        List<CourseMessageDTO> result = messageRepository.findMessagesByMntIdAndStateNot(courseId, ObjectState.DELETED)
+                .stream()
+                .map(message -> new CourseMessageDTO(messageMapper.toMessageVO(message)))
+                .collect(Collectors.toList());
+        for (CourseMessageDTO courseMessageDTO : result) {
+            courseMessageDTO.setChildren(
+                    messageRepository.findMessagesByMntIdAndStateNot(courseMessageDTO.getMainMessage().getId(), ObjectState.DELETED)
+                            .stream()
+                            .map(messageMapper::toMessageVO)
+                            .collect(Collectors.toList()));
+        }
+        return result;
+    }
 }

+ 13 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/MessageController.java

@@ -1,11 +1,14 @@
 package cn.seecoder.seecoderportalserver.web.rest;
 
 import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalcommon.vo.dto.CourseMessageDTO;
 import cn.seecoder.seecoderportalserver.security.SecurityUtils;
 import cn.seecoder.seecoderportalserver.service.MessageService;
 import cn.seecoder.seecoderportalserver.utility.OkResponse;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/message")
 public class MessageController {
@@ -34,4 +37,14 @@ public class MessageController {
     public OkResponse<MessageVO> getMessageById(@RequestParam Long id) {
         return OkResponse.of(messageService.getMessageById(id));
     }
+
+    @GetMapping("/getUnreadByUser")
+    public OkResponse<List<MessageVO>> getUnreadMessagesByUser(@RequestParam(defaultValue = "3") Integer day){
+        return OkResponse.of(messageService.getUnreadMessagesByUserId(SecurityUtils.getCurrentUser().getId(), day));
+    }
+
+    @GetMapping("/getByCourseId")
+    public OkResponse<List<CourseMessageDTO>> getMessagesByCourse(@RequestParam Long courseId){
+        return OkResponse.of(messageService.getMessagesByCourseId(courseId, SecurityUtils.getCurrentUser().getId()));
+    }
 }