|
@@ -27,210 +27,11 @@ public class ChannelMessageSyncResp {
|
|
private Integer more=1;
|
|
private Integer more=1;
|
|
|
|
|
|
|
|
|
|
- private List<Message> messages;
|
|
|
|
|
|
+ private List<ChannelMessageSyncMessageVO> messages;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- class Message {
|
|
|
|
|
|
|
|
- public Message() {
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Message(MessageHeader header, Integer setting, Long messageId, String clientMsgNo, String messageSeq, String fromUid, String channelId, Integer channelType, Long timestamp, String payload) {
|
|
|
|
- this.header = header;
|
|
|
|
- this.setting = setting;
|
|
|
|
- this.messageId = messageId;
|
|
|
|
- this.clientMsgNo = clientMsgNo;
|
|
|
|
- this.messageSeq = messageSeq;
|
|
|
|
- this.fromUid = fromUid;
|
|
|
|
- this.channelId = channelId;
|
|
|
|
- this.channelType = channelType;
|
|
|
|
- this.timestamp = timestamp;
|
|
|
|
- this.payload = payload;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private MessageHeader header;
|
|
|
|
- /**
|
|
|
|
- * 消息设置 消息设置是一个 uint8的数字类型 为1个字节,完全由第三方自定义 比如定义第8位为已读未读回执标记,开启则为0000 0001 = 1
|
|
|
|
- */
|
|
|
|
- private Integer setting;
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 消息全局唯一ID
|
|
|
|
- */
|
|
|
|
- @JsonProperty("message_id")
|
|
|
|
- private Long messageId;
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 客户端消息编号,可用此字段去重
|
|
|
|
- */
|
|
|
|
- @JsonProperty("client_msg_no")
|
|
|
|
- private String clientMsgNo;
|
|
|
|
- /**
|
|
|
|
- * 消息序列号 (用户唯一,有序递增)
|
|
|
|
- */
|
|
|
|
- @JsonProperty("message_seq")
|
|
|
|
- private String messageSeq;
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 发送者用户id
|
|
|
|
- */
|
|
|
|
- @JsonProperty("from_uid")
|
|
|
|
- private String fromUid;
|
|
|
|
- /**
|
|
|
|
- * 频道ID
|
|
|
|
- */
|
|
|
|
- @JsonProperty("channel_id")
|
|
|
|
- private String channelId;
|
|
|
|
- /**
|
|
|
|
- * 频道类型 1.个人频道 2.群频道
|
|
|
|
- */
|
|
|
|
- @JsonProperty("channel_type")
|
|
|
|
- private Integer channelType;
|
|
|
|
- /**
|
|
|
|
- * 消息10位到秒的时间戳
|
|
|
|
- */
|
|
|
|
- @JsonProperty("timestamp")
|
|
|
|
- private Long timestamp;
|
|
|
|
- /**
|
|
|
|
- * base64编码的消息内容
|
|
|
|
- */
|
|
|
|
- @JsonProperty("payload")
|
|
|
|
- private String payload;
|
|
|
|
-
|
|
|
|
- public MessageHeader getHeader() {
|
|
|
|
- return header;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setHeader(MessageHeader header) {
|
|
|
|
- this.header = header;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Integer getSetting() {
|
|
|
|
- return setting;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setSetting(Integer setting) {
|
|
|
|
- this.setting = setting;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Long getMessageId() {
|
|
|
|
- return messageId;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setMessageId(Long messageId) {
|
|
|
|
- this.messageId = messageId;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public String getClientMsgNo() {
|
|
|
|
- return clientMsgNo;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setClientMsgNo(String clientMsgNo) {
|
|
|
|
- this.clientMsgNo = clientMsgNo;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public String getMessageSeq() {
|
|
|
|
- return messageSeq;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setMessageSeq(String messageSeq) {
|
|
|
|
- this.messageSeq = messageSeq;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public String getFromUid() {
|
|
|
|
- return fromUid;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setFromUid(String fromUid) {
|
|
|
|
- this.fromUid = fromUid;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public String getChannelId() {
|
|
|
|
- return channelId;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setChannelId(String channelId) {
|
|
|
|
- this.channelId = channelId;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Integer getChannelType() {
|
|
|
|
- return channelType;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setChannelType(Integer channelType) {
|
|
|
|
- this.channelType = channelType;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Long getTimestamp() {
|
|
|
|
- return timestamp;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setTimestamp(Long timestamp) {
|
|
|
|
- this.timestamp = timestamp;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public String getPayload() {
|
|
|
|
- return payload;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setPayload(String payload) {
|
|
|
|
- this.payload = payload;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- class MessageHeader {
|
|
|
|
-
|
|
|
|
- public MessageHeader() {
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public MessageHeader(Integer noPersist, Integer redDot, Integer syncOnce) {
|
|
|
|
- this.noPersist = noPersist;
|
|
|
|
- this.redDot = redDot;
|
|
|
|
- this.syncOnce = syncOnce;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 否不存储消息 0.存储 1.不存储
|
|
|
|
- */
|
|
|
|
- @JsonProperty("no_persist")
|
|
|
|
- private Integer noPersist;
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 是否显示红点计数,0.不显示 1.显示
|
|
|
|
- */
|
|
|
|
- @JsonProperty("red_dot")
|
|
|
|
- private Integer redDot;
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 否是写扩散,这里一般是0,只有cmd消息才是1
|
|
|
|
- */
|
|
|
|
- @JsonProperty("sync_once")
|
|
|
|
- private Integer syncOnce;
|
|
|
|
-
|
|
|
|
- public Integer getNoPersist() {
|
|
|
|
- return noPersist;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setNoPersist(Integer noPersist) {
|
|
|
|
- this.noPersist = noPersist;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Integer getRedDot() {
|
|
|
|
- return redDot;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setRedDot(Integer redDot) {
|
|
|
|
- this.redDot = redDot;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public Integer getSyncOnce() {
|
|
|
|
- return syncOnce;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- public void setSyncOnce(Integer syncOnce) {
|
|
|
|
- this.syncOnce = syncOnce;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
|
|
public Integer getStartMessageSeq() {
|
|
public Integer getStartMessageSeq() {
|
|
return startMessageSeq;
|
|
return startMessageSeq;
|
|
@@ -256,11 +57,11 @@ public class ChannelMessageSyncResp {
|
|
this.more = more;
|
|
this.more = more;
|
|
}
|
|
}
|
|
|
|
|
|
- public List<Message> getMessages() {
|
|
|
|
|
|
+ public List<ChannelMessageSyncMessageVO> getMessages() {
|
|
return messages;
|
|
return messages;
|
|
}
|
|
}
|
|
|
|
|
|
- public void setMessages(List<Message> messages) {
|
|
|
|
|
|
+ public void setMessages(List<ChannelMessageSyncMessageVO> messages) {
|
|
this.messages = messages;
|
|
this.messages = messages;
|
|
}
|
|
}
|
|
}
|
|
}
|