diff --git a/src/main/java/com/upchina/group/entity/GroupMessage.java b/src/main/java/com/upchina/group/entity/GroupMessage.java index d2eced8..c62c19f 100644 --- a/src/main/java/com/upchina/group/entity/GroupMessage.java +++ b/src/main/java/com/upchina/group/entity/GroupMessage.java @@ -66,6 +66,12 @@ public class GroupMessage implements Serializable { @TableField("to_user_id") private String toUserId; + /** + * 接受用户名称(仅私聊) + */ + @TableField("to_user_name") + private String toUserName; + /** * 用户名称 */ @@ -78,6 +84,12 @@ public class GroupMessage implements Serializable { @TableField("private_user_id") private String privateUserId; + /** + * 私聊用户名称 + */ + @TableField("private_user_name") + private String privateUserName; + /** * 消息内容 */ @@ -173,6 +185,7 @@ public class GroupMessage implements Serializable { public void setId(Integer id) { this.id = id; } + public Integer getMsgType() { return msgType; } @@ -180,6 +193,7 @@ public class GroupMessage implements Serializable { public void setMsgType(Integer msgType) { this.msgType = msgType; } + public Integer getGroupId() { return groupId; } @@ -187,6 +201,7 @@ public class GroupMessage implements Serializable { public void setGroupId(Integer groupId) { this.groupId = groupId; } + public Integer getInteractiveType() { return interactiveType; } @@ -194,6 +209,7 @@ public class GroupMessage implements Serializable { public void setInteractiveType(Integer interactiveType) { this.interactiveType = interactiveType; } + public Integer getUserType() { return userType; } @@ -201,6 +217,7 @@ public class GroupMessage implements Serializable { public void setUserType(Integer userType) { this.userType = userType; } + public String getUserId() { return userId; } @@ -208,6 +225,7 @@ public class GroupMessage implements Serializable { public void setUserId(String userId) { this.userId = userId; } + public Integer getToUserType() { return toUserType; } @@ -215,6 +233,7 @@ public class GroupMessage implements Serializable { public void setToUserType(Integer toUserType) { this.toUserType = toUserType; } + public String getToUserId() { return toUserId; } @@ -222,6 +241,15 @@ public class GroupMessage implements Serializable { public void setToUserId(String toUserId) { this.toUserId = toUserId; } + + public String getToUserName() { + return toUserName; + } + + public void setToUserName(String toUserName) { + this.toUserName = toUserName; + } + public String getUserName() { return userName; } @@ -229,6 +257,7 @@ public class GroupMessage implements Serializable { public void setUserName(String userName) { this.userName = userName; } + public String getPrivateUserId() { return privateUserId; } @@ -236,6 +265,15 @@ public class GroupMessage implements Serializable { public void setPrivateUserId(String privateUserId) { this.privateUserId = privateUserId; } + + public String getPrivateUserName() { + return privateUserName; + } + + public void setPrivateUserName(String privateUserName) { + this.privateUserName = privateUserName; + } + public String getContent() { return content; } @@ -243,6 +281,7 @@ public class GroupMessage implements Serializable { public void setContent(String content) { this.content = content; } + public Integer getContentType() { return contentType; } @@ -250,6 +289,7 @@ public class GroupMessage implements Serializable { public void setContentType(Integer contentType) { this.contentType = contentType; } + public Integer getReplyId() { return replyId; } @@ -257,6 +297,7 @@ public class GroupMessage implements Serializable { public void setReplyId(Integer replyId) { this.replyId = replyId; } + public Integer getQuoteId() { return quoteId; } @@ -264,6 +305,7 @@ public class GroupMessage implements Serializable { public void setQuoteId(Integer quoteId) { this.quoteId = quoteId; } + public Integer getStatus() { return status; } @@ -271,6 +313,7 @@ public class GroupMessage implements Serializable { public void setStatus(Integer status) { this.status = status; } + public String getCreateUserId() { return createUserId; } @@ -278,6 +321,7 @@ public class GroupMessage implements Serializable { public void setCreateUserId(String createUserId) { this.createUserId = createUserId; } + public LocalDateTime getCreateTime() { return createTime; } @@ -285,6 +329,7 @@ public class GroupMessage implements Serializable { public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; } + public Integer getUpdateUserId() { return updateUserId; } @@ -292,6 +337,7 @@ public class GroupMessage implements Serializable { public void setUpdateUserId(Integer updateUserId) { this.updateUserId = updateUserId; } + public LocalDateTime getUpdateTime() { return updateTime; } @@ -299,6 +345,7 @@ public class GroupMessage implements Serializable { public void setUpdateTime(LocalDateTime updateTime) { this.updateTime = updateTime; } + public LocalDateTime getDeleteTime() { return deleteTime; } @@ -306,6 +353,7 @@ public class GroupMessage implements Serializable { public void setDeleteTime(LocalDateTime deleteTime) { this.deleteTime = deleteTime; } + public Integer getDeleteUserId() { return deleteUserId; } @@ -313,6 +361,7 @@ public class GroupMessage implements Serializable { public void setDeleteUserId(Integer deleteUserId) { this.deleteUserId = deleteUserId; } + public Integer getAuditUserId() { return auditUserId; } @@ -320,6 +369,7 @@ public class GroupMessage implements Serializable { public void setAuditUserId(Integer auditUserId) { this.auditUserId = auditUserId; } + public LocalDateTime getAuditTime() { return auditTime; } @@ -327,6 +377,7 @@ public class GroupMessage implements Serializable { public void setAuditTime(LocalDateTime auditTime) { this.auditTime = auditTime; } + public Integer getAdvisorId() { return advisorId; } @@ -334,6 +385,7 @@ public class GroupMessage implements Serializable { public void setAdvisorId(Integer advisorId) { this.advisorId = advisorId; } + public Integer getIsRecommend() { return isRecommend; } @@ -345,30 +397,33 @@ public class GroupMessage implements Serializable { @Override public String toString() { return "GroupMessage{" + - "id=" + id + - ", msgType=" + msgType + - ", groupId=" + groupId + - ", interactiveType=" + interactiveType + - ", userType=" + userType + - ", userId=" + userId + - ", toUserType=" + toUserType + - ", toUserId=" + toUserId + - ", userName=" + userName + - ", content=" + content + - ", contentType=" + contentType + - ", replyId=" + replyId + - ", quoteId=" + quoteId + - ", status=" + status + - ", createUserId=" + createUserId + - ", createTime=" + createTime + - ", updateUserId=" + updateUserId + - ", updateTime=" + updateTime + - ", deleteTime=" + deleteTime + - ", deleteUserId=" + deleteUserId + - ", auditUserId=" + auditUserId + - ", auditTime=" + auditTime + - ", advisorId=" + advisorId + - ", isRecommend=" + isRecommend + - "}"; + "id=" + id + + ", msgType=" + msgType + + ", groupId=" + groupId + + ", interactiveType=" + interactiveType + + ", userType=" + userType + + ", userId='" + userId + '\'' + + ", toUserType=" + toUserType + + ", toUserId='" + toUserId + '\'' + + ", toUserName='" + toUserName + '\'' + + ", userName='" + userName + '\'' + + ", privateUserId='" + privateUserId + '\'' + + ", privateUserName='" + privateUserName + '\'' + + ", content='" + content + '\'' + + ", contentType=" + contentType + + ", replyId=" + replyId + + ", quoteId=" + quoteId + + ", status=" + status + + ", createUserId='" + createUserId + '\'' + + ", createTime=" + createTime + + ", updateUserId=" + updateUserId + + ", updateTime=" + updateTime + + ", deleteTime=" + deleteTime + + ", deleteUserId=" + deleteUserId + + ", auditUserId=" + auditUserId + + ", auditTime=" + auditTime + + ", advisorId=" + advisorId + + ", isRecommend=" + isRecommend + + '}'; } } diff --git a/src/main/java/com/upchina/group/query/message/SendGroupMessageAdminQuery.java b/src/main/java/com/upchina/group/query/message/SendGroupMessageAdminQuery.java index 0933082..7de2fe8 100644 --- a/src/main/java/com/upchina/group/query/message/SendGroupMessageAdminQuery.java +++ b/src/main/java/com/upchina/group/query/message/SendGroupMessageAdminQuery.java @@ -36,6 +36,9 @@ public class SendGroupMessageAdminQuery { @ApiModelProperty("接收用户ID(私聊)") private String toUserId; + @ApiModelProperty("接收用户名称(私聊)") + private String toUserName; + @ApiModelProperty("是否精选 1是 2否") private Integer isRecommend = 2; @@ -58,7 +61,9 @@ public class SendGroupMessageAdminQuery { message.setInteractiveType(interactiveType); if (GroupInteractiveType.PRIVATE.value.equals(interactiveType)) { message.setToUserId(toUserId); + message.setToUserName(toUserName); message.setPrivateUserId(toUserId); + message.setPrivateUserName(toUserName); } message.setStatus(GroupMessageStatus.AUDITED.value); message.setCreateUserId(userVO.getUserId().toString()); @@ -123,6 +128,14 @@ public class SendGroupMessageAdminQuery { this.toUserId = toUserId; } + public String getToUserName() { + return toUserName; + } + + public void setToUserName(String toUserName) { + this.toUserName = toUserName; + } + public Integer getIsRecommend() { return isRecommend; } diff --git a/src/main/java/com/upchina/group/query/message/SendGroupMessageAppQuery.java b/src/main/java/com/upchina/group/query/message/SendGroupMessageAppQuery.java index 04f45bf..d7e5bf9 100644 --- a/src/main/java/com/upchina/group/query/message/SendGroupMessageAppQuery.java +++ b/src/main/java/com/upchina/group/query/message/SendGroupMessageAppQuery.java @@ -39,6 +39,7 @@ public class SendGroupMessageAppQuery { message.setInteractiveType(interactiveType); if (GroupInteractiveType.PRIVATE.value.equals(interactiveType)) { message.setPrivateUserId(userVO.getUserId()); + message.setPrivateUserName(userVO.getUserName()); } message.setStatus(status.value); message.setCreateUserId(userVO.getUserId()); diff --git a/src/main/java/com/upchina/group/vo/message/GroupMessageVO.java b/src/main/java/com/upchina/group/vo/message/GroupMessageVO.java index f77bf59..081ea83 100644 --- a/src/main/java/com/upchina/group/vo/message/GroupMessageVO.java +++ b/src/main/java/com/upchina/group/vo/message/GroupMessageVO.java @@ -30,6 +30,18 @@ public class GroupMessageVO implements Serializable { @ApiModelProperty("用户名称") private String userName; + @ApiModelProperty("接受用户ID") + private String toUserId; + + @ApiModelProperty("接受用户名称") + private String toUserName; + + @ApiModelProperty("私聊用户ID") + private String privateUserId; + + @ApiModelProperty("私聊用户名称") + private String privateUserName; + @ApiModelProperty("消息内容") private String content; @@ -74,6 +86,10 @@ public class GroupMessageVO implements Serializable { this.userType = message.getUserType(); this.userId = message.getUserId(); this.userName = message.getUserName(); + this.toUserId = message.getToUserId(); + this.toUserName = message.getToUserName(); + this.privateUserId = message.getPrivateUserId(); + this.privateUserName = message.getPrivateUserName(); this.content = message.getContent(); this.contentType = message.getContentType(); this.replyId = message.getReplyId(); @@ -141,6 +157,38 @@ public class GroupMessageVO implements Serializable { this.userName = userName; } + public String getToUserId() { + return toUserId; + } + + public void setToUserId(String toUserId) { + this.toUserId = toUserId; + } + + public String getToUserName() { + return toUserName; + } + + public void setToUserName(String toUserName) { + this.toUserName = toUserName; + } + + public String getPrivateUserId() { + return privateUserId; + } + + public void setPrivateUserId(String privateUserId) { + this.privateUserId = privateUserId; + } + + public String getPrivateUserName() { + return privateUserName; + } + + public void setPrivateUserName(String privateUserName) { + this.privateUserName = privateUserName; + } + public String getContent() { return content; } @@ -228,5 +276,4 @@ public class GroupMessageVO implements Serializable { public void setAdvisor(AdvisorBasicVO advisor) { this.advisor = advisor; } - -} \ No newline at end of file +} \ No newline at end of file