|
|
@@ -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 +
|
|
|
'}';
|