feat: 重构公告及消息，公告支持系统消息推送提醒、定时发布、置顶、记录读取状态

Author: Charles7c

continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql

@@ -12,3 +12,8 @@ VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173
 -- 默认分组：continew-admin
 INSERT INTO `sj_group_config` (`id`, `namespace_id`, `group_name`, `description`, `token`, `group_status`, `version`, `group_partition`, `id_generator_mode`, `init_scene`, `create_dt`, `update_dt`)
 VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'continew-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, NOW(), NOW());
+
+-- 默认任务：NoticePublishJob
+INSERT INTO `sj_job`
+(`namespace_id`, `group_name`, `job_name`, `args_type`, `next_trigger_at`, `job_status`, `task_type`, `route_key`, `executor_type`, `executor_info`, `trigger_type`, `trigger_interval`, `block_strategy`, `executor_timeout`, `max_retry_times`, `parallel_num`, `retry_interval`, `bucket_index`, `resident`, `notify_ids`, `owner_id`, `description`, `ext_attrs`, `deleted`, `create_dt`, `update_dt`)
+VALUES ('764d604ec6fc45f68cd92514c40e9e1a', 'continew-admin', '公告发布', 1, 1747546500000, 1, 1, 4, 1, 'NoticePublishJob', 3, '0 * * * * ?', 1, 60, 3, 1, 1, 27, 0, '', NULL, '定时发布公告', '', 0, NOW(), NOW());

continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql

@@ -12,3 +12,8 @@ VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173
 -- 默认分组：continew-admin
 INSERT INTO sj_group_config (id, namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, create_dt, update_dt)
 VALUES (1, '764d604ec6fc45f68cd92514c40e9e1a', 'continew-admin', '默认分组', 'SJ_Wyz3dmsdbDOkDujOTSSoBjGQP1BMsVnj', 1, 1, 0, 2, 1, NOW(), NOW());
+
+-- 默认任务：NoticePublishJob
+INSERT INTO sj_job
+(namespace_id, group_name, job_name, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy, executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, description, ext_attrs, deleted, create_dt, update_dt)
+VALUES ('764d604ec6fc45f68cd92514c40e9e1a', 'continew-admin', '公告发布', 1, 1747546500000, 1, 1, 4, 1, 'NoticePublishJob', 3, '0 * * * * ?', 1, 60, 3, 1, 1, 27, 0, '', NULL, '定时发布公告', '', 0, NOW(), NOW());

continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java

@@ -24,7 +24,6 @@
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.json.JSONUtil;
 import com.xkcoding.justauth.autoconfigure.JustAuthProperties;
-
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import me.zhyd.oauth.AuthRequestBuilder;
@@ -54,11 +53,9 @@
 import top.continew.starter.core.autoconfigure.project.ProjectProperties;
 import top.continew.starter.core.exception.BadRequestException;
 import top.continew.starter.core.validation.ValidationUtils;
-import top.continew.starter.messaging.websocket.util.WebSocketUtils;
 
 import java.time.LocalDateTime;
 import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -168,15 +165,10 @@ private AuthRequest getAuthRequest(String source) {
      * @param user 用户信息
      */
     private void sendSecurityMsg(UserDO user) {
-        MessageReq req = new MessageReq();
-        MessageTemplateEnum socialRegister = MessageTemplateEnum.SOCIAL_REGISTER;
-        req.setTitle(socialRegister.getTitle().formatted(projectProperties.getName()));
-        req.setContent(socialRegister.getContent().formatted(user.getNickname()));
-        req.setType(MessageTypeEnum.SECURITY);
-        messageService.add(req, CollUtil.toList(user.getId()));
-        List<String> tokenList = StpUtil.getTokenValueListByLoginId(user.getId());
-        for (String token : tokenList) {
-            WebSocketUtils.sendMessage(token, "1");
-        }
+        MessageTemplateEnum template = MessageTemplateEnum.SOCIAL_REGISTER;
+        MessageReq req = new MessageReq(MessageTypeEnum.SECURITY);
+        req.setTitle(template.getTitle().formatted(projectProperties.getName()));
+        req.setContent(template.getContent().formatted(user.getNickname()));
+        messageService.add(req, CollUtil.toList(user.getId().toString()));
     }
 }

continew-module-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java

@@ -32,8 +32,14 @@ public enum MessageTemplateEnum {
     /**
      * 第三方登录
      */
-    SOCIAL_REGISTER("欢迎注册 %s", "尊敬的 %s，欢迎注册使用，请及时配置您的密码。");
+    SOCIAL_REGISTER("欢迎注册 %s", "尊敬的 %s，欢迎注册使用，请及时配置您的密码。", "/user/profile"),
+
+    /**
+     * 公告发布
+     */
+    NOTICE_PUBLISH("您有一条新的公告", "公告《%s》已发布，请及时查看。", "/user/notice?id=%s");
 
     private final String title;
     private final String content;
+    private final String path;
 }

continew-module-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java

@@ -31,10 +31,15 @@
 @RequiredArgsConstructor
 public enum MessageTypeEnum implements BaseEnum<Integer> {
 
+    /**
+     * 系统消息
+     */
+    SYSTEM(1, "系统消息", UiConstants.COLOR_PRIMARY),
+
     /**
      * 安全消息
      */
-    SECURITY(1, "安全消息", UiConstants.COLOR_PRIMARY),;
+    SECURITY(2, "安全消息", UiConstants.COLOR_WARNING),;
 
     private final Integer value;
     private final String description;

continew-module-system/src/main/java/top/continew/admin/system/enums/NoticeMethodEnum.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.admin.system.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import top.continew.starter.core.enums.BaseEnum;
+
+/**
+ * 公告通知方式枚举
+ *
+ * @author Charles7c
+ * @since 2025/5/8 21:18
+ */
+@Getter
+@RequiredArgsConstructor
+public enum NoticeMethodEnum implements BaseEnum<Integer> {
+
+    /**
+     * 系统消息
+     */
+    SYSTEM_MESSAGE(1, "系统消息"),;
+
+    private final Integer value;
+    private final String description;
+}

continew-module-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java

@@ -21,8 +21,6 @@
 import top.continew.admin.common.constant.UiConstants;
 import top.continew.starter.core.enums.BaseEnum;
 
-import java.time.LocalDateTime;
-
 /**
  * 公告状态枚举
  *
@@ -34,39 +32,21 @@
 public enum NoticeStatusEnum implements BaseEnum<Integer> {
 
     /**
-     * 待发布
+     * 草稿
      */
-    PENDING_RELEASE(1, "待发布", UiConstants.COLOR_PRIMARY),
+    DRAFT(1, "草稿", UiConstants.COLOR_WARNING),
 
     /**
-     * 已发布
+     * 待发布
      */
-    PUBLISHED(2, "已发布", UiConstants.COLOR_SUCCESS),
+    PENDING(2, "待发布", UiConstants.COLOR_PRIMARY),
 
     /**
-     * 已过期
+     * 已发布
      */
-    EXPIRED(3, "已过期", UiConstants.COLOR_ERROR),;
+    PUBLISHED(3, "已发布", UiConstants.COLOR_SUCCESS),;
 
     private final Integer value;
     private final String description;
     private final String color;
-
-    /**
-     * 获取公告状态
-     *
-     * @param effectiveTime 生效时间
-     * @param terminateTime 终止时间
-     * @return 公告状态
-     */
-    public static NoticeStatusEnum getStatus(LocalDateTime effectiveTime, LocalDateTime terminateTime) {
-        LocalDateTime now = LocalDateTime.now();
-        if (effectiveTime != null && effectiveTime.isAfter(now)) {
-            return PENDING_RELEASE;
-        }
-        if (terminateTime != null && terminateTime.isBefore(now)) {
-            return EXPIRED;
-        }
-        return PUBLISHED;
-    }
 }

…min/system/mapper/MessageUserMapper.java …dmin/system/mapper/MessageLogMapper.javacontinew-module-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java renamed to continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageLogMapper.java continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java renamed to continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageLogMapper.java

@@ -16,24 +16,15 @@
 
 package top.continew.admin.system.mapper;
 
-import org.apache.ibatis.annotations.Param;
-import top.continew.admin.system.model.entity.MessageUserDO;
+import top.continew.admin.system.model.entity.MessageLogDO;
 import top.continew.starter.data.mp.base.BaseMapper;
 
 /**
- * 消息和用户 Mapper
+ * 消息日志 Mapper
  *
  * @author Bull-BCLS
+ * @author Charles7c
  * @since 2023/10/15 20:25
  */
-public interface MessageUserMapper extends BaseMapper<MessageUserDO> {
-
-    /**
-     * 根据用户 ID 和消息类型查询未读消息数量
-     *
-     * @param userId 用户 ID
-     * @param type   消息类型
-     * @return 未读消息信息
-     */
-    Long selectUnreadCountByUserIdAndType(@Param("userId") Long userId, @Param("type") Integer type);
+public interface MessageLogMapper extends BaseMapper<MessageLogDO> {
 }

continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java

@@ -16,14 +16,16 @@
 
 package top.continew.admin.system.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import top.continew.admin.system.model.entity.MessageDO;
+import top.continew.admin.system.model.query.MessageQuery;
 import top.continew.admin.system.model.resp.message.MessageResp;
 import top.continew.starter.data.mp.base.BaseMapper;
 
+import java.util.List;
+
 /**
  * 消息 Mapper
  *
@@ -33,12 +35,28 @@
 public interface MessageMapper extends BaseMapper<MessageDO> {
 
     /**
-     * 分页查询列表
+     * 分页查询消息列表
+     *
+     * @param page  分页参数
+     * @param query 查询条件
+     * @return 消息列表
+     */
+    IPage<MessageResp> selectMessagePage(@Param("page") Page<MessageDO> page, @Param("query") MessageQuery query);
+
+    /**
+     * 查询未读消息列表
+     *
+     * @param userId 用户 ID
+     * @return 消息列表
+     */
+    List<MessageDO> selectUnreadListByUserId(@Param("userId") Long userId);
+
+    /**
+     * 查询未读消息数量
      *
-     * @param page         分页查询条件
-     * @param queryWrapper 查询条件
-     * @return 分页信息
+     * @param userId 用户 ID
+     * @param type   消息类型
+     * @return 未读消息数量
      */
-    IPage<MessageResp> selectPageByUserId(@Param("page") IPage<Object> page,
-                                          @Param(Constants.WRAPPER) QueryWrapper<MessageDO> queryWrapper);
+    Long selectUnreadCountByUserIdAndType(@Param("userId") Long userId, @Param("type") Integer type);
 }

continew-module-system/src/main/java/top/continew/admin/system/mapper/NoticeLogMapper.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.continew.admin.system.mapper;
+
+import top.continew.admin.system.model.entity.NoticeLogDO;
+import top.continew.starter.data.mp.base.BaseMapper;
+
+/**
+ * 公告日志 Mapper
+ *
+ * @author Charles7c
+ * @since 2025/5/18 19:17
+ */
+public interface NoticeLogMapper extends BaseMapper<NoticeLogDO> {
+}