From 924ae6060ba9e719ddc7ac9c9de19fefb1a3d899 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 16 Oct 2025 18:31:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=96=B0=E5=A2=9Etype=20noti?= =?UTF-8?q?fication-=E9=80=9A=E7=9F=A5=EF=BC=8Cactivity-=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/inner/model/cmd/sys/SysNoticeMessageCmd.java | 5 +++++ .../other/inner/model/dto/sys/SysNoticeMessageDTO.java | 5 +++++ .../infra/database/rds/entity/sys/NoticeMessage.java | 8 ++++++++ .../service/sys/impl/NoticeMessageClientServiceImpl.java | 5 +++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/sys/SysNoticeMessageCmd.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/sys/SysNoticeMessageCmd.java index 9116ab9d..65af569f 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/sys/SysNoticeMessageCmd.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/sys/SysNoticeMessageCmd.java @@ -39,6 +39,11 @@ public class SysNoticeMessageCmd extends CommonCommand { */ private String title; + /** + * 公告类型：notification-通知，activity-活动. + */ + private String type; + /** * 封面. */ diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/sys/SysNoticeMessageDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/sys/SysNoticeMessageDTO.java index d26acd54..d4718108 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/sys/SysNoticeMessageDTO.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/sys/SysNoticeMessageDTO.java @@ -39,6 +39,11 @@ public class SysNoticeMessageDTO implements Serializable { */ private String title; + /** + * 公告类型：notification-通知，activity-活动. + */ + private String type; + /** * 封面. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/NoticeMessage.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/NoticeMessage.java index 4928962c..22490567 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/NoticeMessage.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/sys/NoticeMessage.java @@ -9,6 +9,7 @@ import java.sql.Timestamp; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.data.mongodb.core.mapping.Field; /** *

@@ -44,6 +45,13 @@ public class NoticeMessage extends TimestampBaseEntity { @TableField("title") private String title; + + /** + * 公告类型：notification-通知，activity-活动. + */ + @TableField("type") + private String type; + /** * 封面. */ diff --git a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/NoticeMessageClientServiceImpl.java b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/NoticeMessageClientServiceImpl.java index ff27e8b4..125e6304 100644 --- a/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/NoticeMessageClientServiceImpl.java +++ b/rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/sys/impl/NoticeMessageClientServiceImpl.java @@ -97,6 +97,7 @@ public class NoticeMessageClientServiceImpl implements NoticeMessageClientServic .set(NoticeMessage::getCover, sysNoticeMessage.getCover()) .set(NoticeMessage::getLink, sysNoticeMessage.getLink()) .set(NoticeMessage::getTitle, sysNoticeMessage.getTitle()) + .set(NoticeMessage::getType, sysNoticeMessage.getType()) .set(NoticeMessage::getSysOrigin, sysNoticeMessage.getSysOrigin()) .set(NoticeMessage::getDescription, sysNoticeMessage.getDescription()) .eq(NoticeMessage::getId, sysNoticeMessage.getId()) @@ -132,7 +133,7 @@ public class NoticeMessageClientServiceImpl implements NoticeMessageClientServic // 创建公共消息到MongoDB PublicMessage publicMessage = new PublicMessage(); publicMessage.setId(IdWorker.getId()); - publicMessage.setType("notification"); + publicMessage.setType(noticeMessage.getType()); publicMessage.setTitle(noticeMessage.getTitle()); publicMessage.setContent(noticeMessage.getDescription()); publicMessage.setImageUrl(noticeMessage.getCover()); @@ -155,7 +156,7 @@ public class NoticeMessageClientServiceImpl implements NoticeMessageClientServic imGroupClient.sendMessageBroadcast( BroadcastGroupMsgBodyCmd.builder() .toPlatform(SysOriginPlatformEnum.LIKEI) - .type(GroupMessageTypeEnum.SYS_ANNOUNCEMENT) + .type("notification".equals(noticeMessage.getType()) ? GroupMessageTypeEnum.SYS_ANNOUNCEMENT : GroupMessageTypeEnum.SYS_ACTIVITY) .data(publicMessage) .build()); }