Browse Source

fix: 修改messageVO

mjh 4 years ago
parent
commit
8a9c573410

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

@@ -5,7 +5,7 @@ import java.time.OffsetDateTime;
 public class MessageVO {
     private Long id;
 
-    private UserVO sender;
+    private UserVOSimplified sender;
 
     private ActionType actionType;
 
@@ -13,12 +13,12 @@ public class MessageVO {
 
     private Long targetId;
 
-    private Long mntId;
-
-    private Object target;
+    private String targetInfo;
 
     private String content;
 
+    private Long mntId;
+
     private OffsetDateTime createdAt;
 
     private ObjectState state;
@@ -31,11 +31,11 @@ public class MessageVO {
         this.id = id;
     }
 
-    public UserVO getSender() {
+    public UserVOSimplified getSender() {
         return sender;
     }
 
-    public void setSender(UserVO sender) {
+    public void setSender(UserVOSimplified sender) {
         this.sender = sender;
     }
 
@@ -55,12 +55,20 @@ public class MessageVO {
         this.targetType = targetType;
     }
 
-    public Object getTarget() {
-        return target;
+    public Long getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(Long targetId) {
+        this.targetId = targetId;
     }
 
-    public void setTarget(Object target) {
-        this.target = target;
+    public String getTargetInfo() {
+        return targetInfo;
+    }
+
+    public void setTargetInfo(String targetInfo) {
+        this.targetInfo = targetInfo;
     }
 
     public String getContent() {
@@ -71,6 +79,14 @@ public class MessageVO {
         this.content = content;
     }
 
+    public Long getMntId() {
+        return mntId;
+    }
+
+    public void setMntId(Long mntId) {
+        this.mntId = mntId;
+    }
+
     public OffsetDateTime getCreatedAt() {
         return createdAt;
     }
@@ -87,22 +103,6 @@ public class MessageVO {
         this.state = state;
     }
 
-    public Long getTargetId() {
-        return targetId;
-    }
-
-    public void setTargetId(Long targetId) {
-        this.targetId = targetId;
-    }
-
-    public Long getMntId() {
-        return mntId;
-    }
-
-    public void setMntId(Long mntId) {
-        this.mntId = mntId;
-    }
-
     @Override
     public String toString() {
         return "MessageVO{" +
@@ -111,9 +111,9 @@ public class MessageVO {
                 ", actionType=" + actionType +
                 ", targetType=" + targetType +
                 ", targetId=" + targetId +
-                ", mntId=" + mntId +
-                ", target=" + target +
+                ", targetInfo='" + targetInfo + '\'' +
                 ", content='" + content + '\'' +
+                ", mntId=" + mntId +
                 ", createdAt=" + createdAt +
                 ", state=" + state +
                 '}';

+ 2 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/ObjectType.java

@@ -3,6 +3,8 @@ package cn.seecoder.seecoderportalcommon.vo;
 public enum ObjectType {
     COURSE("COURSE"),
     ANNOUNCEMENT("ANNOUNCEMENT"),
+    HOMEWORK("HOMEWORK"),
+    EXAM("EXAM"),
     COMMENT("COMMENT");
 
     private final String type;

+ 39 - 0
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/UserVOSimplified.java

@@ -0,0 +1,39 @@
+package cn.seecoder.seecoderportalcommon.vo;
+
+public class UserVOSimplified {
+    private Long id;
+
+    private String name;
+
+    public UserVOSimplified() {
+    }
+
+    public UserVOSimplified(UserVO userVO) {
+        this.id = userVO.getId();
+        this.name = userVO.getName();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "UserVOSimplified{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}

+ 13 - 18
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/dto/CourseMessageDTO.java

@@ -2,34 +2,29 @@ package cn.seecoder.seecoderportalcommon.vo.dto;
 
 import cn.seecoder.seecoderportalcommon.vo.MessageVO;
 
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 public class CourseMessageDTO {
-    private MessageVO mainMessage;
+    private final Long mainId;
 
-    private List<MessageVO> children;
+    private final Map<Long, MessageVO> messages;
 
-    public MessageVO getMainMessage() {
-        return mainMessage;
+    public Long getMainId() {
+        return mainId;
     }
 
-    public void setMainMessage(MessageVO mainMessage) {
-        this.mainMessage = mainMessage;
-    }
-
-    public List<MessageVO> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<MessageVO> children) {
-        this.children = children;
+    public Map<Long, MessageVO> getMessages() {
+        return messages;
     }
 
     public CourseMessageDTO(MessageVO mainMessage) {
-        this.mainMessage = mainMessage;
+        this.mainId = mainMessage.getId();
+        this.messages = new HashMap<>();
+        this.messages.put(mainId, mainMessage);
     }
 
-    public void addChild(MessageVO messageVO){
-        this.children.add(messageVO);
+    public void addMessage(Long messageId, MessageVO messageVO){
+        this.messages.put(messageId, messageVO);
     }
 }

+ 7 - 5
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/MessageMapperImpl.java

@@ -1,6 +1,7 @@
 package cn.seecoder.seecoderportalserver.mapper.impl;
 
 import cn.seecoder.seecoderportalcommon.vo.MessageVO;
+import cn.seecoder.seecoderportalcommon.vo.UserVOSimplified;
 import cn.seecoder.seecoderportalserver.domain.Message;
 import cn.seecoder.seecoderportalserver.mapper.MessageMapper;
 import cn.seecoder.seecoderportalserver.repository.MessageRepository;
@@ -52,24 +53,25 @@ public class MessageMapperImpl implements MessageMapper {
         MessageVO messageVO = new MessageVO();
 
         messageVO.setId(message.getId());
-        messageVO.setSender(userService.findUserById(message.getSenderId()));
+        messageVO.setSender(new UserVOSimplified(userService.findUserById(message.getSenderId())));
         messageVO.setActionType(message.getActionType());
         messageVO.setTargetType(message.getTargetType());
         messageVO.setTargetId(message.getTargetId());
         switch (message.getTargetType()) {
             case COURSE:
-                messageVO.setTarget(courseService.getCourseById(message.getTargetId()));
+                messageVO.setTargetInfo(courseService.getCourseById(message.getTargetId()).getName());
                 break;
             case COMMENT:
-                messageVO.setTarget(this.toMessageVO(messageRepository.findById(message.getTargetId()).orElse(null)));
+                Message target = messageRepository.findById(message.getTargetId()).orElse(null);
+                assert target != null;
+                messageVO.setTargetInfo(target.getContent());
                 break;
             case ANNOUNCEMENT:
-                messageVO.setTarget(announcementService.getAnnouncementById(message.getTargetId()));
+                messageVO.setTargetInfo(announcementService.getAnnouncementById(message.getTargetId()).getTitle());
                 break;
             default:
                 break;
         }
-        messageVO.setMntId(message.getMntId());
         messageVO.setContent(message.getContent());
         messageVO.setCreatedAt(message.getCreatedAt());
         messageVO.setState(message.getState());

+ 4 - 5
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/MessageService.java

@@ -138,11 +138,10 @@ public class MessageService {
                 .map(message -> new CourseMessageDTO(messageMapper.toMessageVO(message)))
                 .collect(Collectors.toList());
         for (CourseMessageDTO courseMessageDTO : result) {
-            courseMessageDTO.setChildren(
-                    messageRepository.findMessagesByMntIdAndActionTypeIsAndTargetTypeIsAndStateNot(courseMessageDTO.getMainMessage().getId(), ActionType.COMMENT, ObjectType.COURSE, ObjectState.DELETED)
-                            .stream()
-                            .map(messageMapper::toMessageVO)
-                            .collect(Collectors.toList()));
+                    for(MessageVO messageVO :messageRepository.findMessagesByMntIdAndActionTypeIsAndTargetTypeIsAndStateNot(courseMessageDTO.getMainId(), ActionType.COMMENT, ObjectType.COMMENT, ObjectState.DELETED)
+                            .stream().map(messageMapper::toMessageVO).collect(Collectors.toList())){
+                        courseMessageDTO.addMessage(messageVO.getId(), messageVO);
+                    }
         }
         return result;
     }