From 46184636b91e486e082e6b352e594e7deba1cd6e Mon Sep 17 00:00:00 2001 From: yanglin Date: Sun, 28 Apr 2024 17:30:43 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2405:=20=E5=A4=84=E7=90=86cms=E7=9A=84?= =?UTF-8?q?=E8=80=81=E6=B6=88=E6=81=AF=E8=AF=BB=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MessageRecordServiceImpl.java | 5 +++++ .../service/impl/oldmsg/OldMsgStatCache.java | 13 +++++++++++++ .../msg/center/api/mq/SendMessageRecordMessage.java | 2 ++ .../axzo/msg/center/api/request/CmsReadMsgReq.java | 5 +++++ .../msg/center/api/request/GeneralMessageReq.java | 6 ++++++ 5 files changed, 31 insertions(+) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java index aad42973..1a558bd6 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java @@ -443,6 +443,11 @@ public class MessageRecordServiceImpl implements MessageRecordService { } else { messageRecordDao.readMsg(request, req.getPersonId(), req.getIdentityId()); } + SendMessageRecordMessage mqMessage = new SendMessageRecordMessage(); + mqMessage.setCmsReadRequest(req); + mqProducer.send(MqMessageRecord + .builder(MqMessageType.OLD_MSG_SEND, mqMessage) + .build()); } /** diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCache.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCache.java index d6af9748..f5eb007e 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCache.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/oldmsg/OldMsgStatCache.java @@ -5,6 +5,7 @@ import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.framework.rocketmq.EventHandler; import cn.axzo.msg.center.api.mq.SendMessageRecordMessage; import cn.axzo.msg.center.api.request.CmsMsgQueryReq; +import cn.axzo.msg.center.api.request.CmsReadMsgReq; import cn.axzo.msg.center.api.request.GeneralMessageReq; import cn.axzo.msg.center.api.request.MessageReadAllReq; import cn.axzo.msg.center.api.response.MessageNewRes; @@ -296,12 +297,16 @@ public class OldMsgStatCache implements EventHandler, InitializingBean { SendMessageRecordMessage mqMessage = event.normalizedData(SendMessageRecordMessage.class); GeneralMessageReq sendRequest = mqMessage.getSendRequest(); MessageReadAllReq readRequest = mqMessage.getReadRequest(); + CmsReadMsgReq cmsReadRequest = mqMessage.getCmsReadRequest(); if (sendRequest != null) { log.info("handle mq event - driven by sendRequest={}", sendRequest); handleSendRequestEvent(sendRequest); } else if (readRequest != null) { log.info("handle mq event - driven by readRequest={}", readRequest); handleReadRequest(readRequest); + } else if (cmsReadRequest != null) { + log.info("handle mq event - driven by cmsReadRequest={}", cmsReadRequest); + handleCmsReadRequest(cmsReadRequest); } } @@ -337,4 +342,12 @@ public class OldMsgStatCache implements EventHandler, InitializingBean { log.info(stopWatch.prettyPrint(TimeUnit.MILLISECONDS)); } + private void handleCmsReadRequest(CmsReadMsgReq cmsReadRequest) throws Exception { + StopWatch stopWatch = new StopWatch("reloadBackground"); + stopWatch.start("handleCmsReadRequest"); + reloadBackground(Sets.newHashSet(cmsReadRequest.getPersonId())); + stopWatch.stop(); + log.info(stopWatch.prettyPrint(TimeUnit.MILLISECONDS)); + } + } \ No newline at end of file diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/SendMessageRecordMessage.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/SendMessageRecordMessage.java index c507168d..835e8746 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/SendMessageRecordMessage.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/SendMessageRecordMessage.java @@ -1,5 +1,6 @@ package cn.axzo.msg.center.api.mq; +import cn.axzo.msg.center.api.request.CmsReadMsgReq; import cn.axzo.msg.center.api.request.GeneralMessageReq; import cn.axzo.msg.center.api.request.MessageReadAllReq; import lombok.Data; @@ -15,4 +16,5 @@ import java.io.Serializable; public class SendMessageRecordMessage extends MqMessage implements Serializable { private GeneralMessageReq sendRequest; private MessageReadAllReq readRequest; + private CmsReadMsgReq cmsReadRequest; } \ No newline at end of file diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsReadMsgReq.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsReadMsgReq.java index 37cdd9b9..35dc962b 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsReadMsgReq.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/CmsReadMsgReq.java @@ -1,6 +1,7 @@ package cn.axzo.msg.center.api.request; import cn.axzo.msg.center.api.enums.BizTypeEnum; +import com.alibaba.fastjson.JSON; import lombok.Data; import javax.validation.constraints.NotNull; @@ -29,4 +30,8 @@ public class CmsReadMsgReq { */ private transient BizTypeEnum bizTypeEnum = BizTypeEnum.CONSTRUCTION; + @Override + public String toString() { + return JSON.toJSONString(this); + } } diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/GeneralMessageReq.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/GeneralMessageReq.java index 430554af..fc3ed358 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/GeneralMessageReq.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/request/GeneralMessageReq.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.api.request; import cn.axzo.msg.center.api.enums.MsgRecordTerminalTypeEnum; import cn.axzo.msg.center.api.enums.ReceiveTypeEnum; +import com.alibaba.fastjson.JSON; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -77,5 +78,10 @@ public class GeneralMessageReq extends AbstractMessage implements Serializable { * appClient: e.g. cmp cm */ public String appClient; + + @Override + public String toString() { + return JSON.toJSONString(this); + } }