fix: refactoring notification handling and message detail building

Author: fit2-zhao

backend/crm/src/main/java/cn/cordys/crm/system/notice/message/MessageDetailService.java

@@ -51,14 +51,14 @@ private List<MessageDetailDTO> getMessageDetailDTOs(String module, boolean useTe
         if (messageTaskLists == null) {
             return new ArrayList<>();
         }
-        getMessageDetailDTOs(useTemplate, template, messageDetails, messageTaskLists);
+        buildMessageDetails(useTemplate, template, messageDetails, messageTaskLists);
         return messageDetails.stream()
                 .sorted(Comparator.comparing(MessageDetailDTO::getCreateTime, Comparator.nullsLast(Long::compareTo)).reversed())
                 .distinct()
                 .collect(Collectors.toList());
     }
 
-    private void getMessageDetailDTOs(boolean useTemplate, String customTemplate, List<MessageDetailDTO> messageDetails, List<MessageTask> messageTaskLists) {
+    private void buildMessageDetails(boolean useTemplate, String customTemplate, List<MessageDetailDTO> messageDetails, List<MessageTask> messageTaskLists) {
         //消息通知任务以消息类型事件接收类型唯一进行分组
         Map<String, List<MessageTask>> messageTaskGroup = messageTaskLists.stream().collect(Collectors.groupingBy(t -> (t.getTaskType() + t.getEvent())));
         messageTaskGroup.forEach((messageTaskId, messageTaskList) -> {

backend/crm/src/main/java/cn/cordys/crm/system/notice/sender/AbstractNoticeSender.java

@@ -13,9 +13,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public abstract class AbstractNoticeSender implements NoticeSender {
 
@@ -29,10 +28,7 @@ protected String getContext(MessageDetailDTO messageDetailDTO, NoticeModel notic
         if (StringUtils.isNotBlank(messageDetailDTO.getTemplate())) {
             return MessageTemplateUtils.getContent(messageDetailDTO.getTemplate(), noticeModel.getParamMap());
         }
-        String context = StringUtils.EMPTY;
-        if (StringUtils.isBlank(context)) {
-            context = noticeModel.getContext();
-        }
+        String context = noticeModel.getContext();
         return MessageTemplateUtils.getContent(context, noticeModel.getParamMap());
     }
 
@@ -54,13 +50,13 @@ protected String getSubjectText(MessageDetailDTO messageDetailDTO, NoticeModel n
     private List<Receiver> getRealUserIds(NoticeModel noticeModel, String orgId) {
         List<Receiver> toUsers = noticeModel.getReceivers();
         if (CollectionUtils.isEmpty(toUsers)) {
-            toUsers = new ArrayList<>();
+            return new ArrayList<>();
         }
 
         // 去重复
-        List<String> userIds = toUsers.stream().map(Receiver::getUserId).toList();
+        List<String> userIds = toUsers.stream().map(Receiver::getUserId).distinct().toList();
         List<User> users = getUsers(userIds, orgId);
-        List<String> realUserIds = new ArrayList<>(users.stream().map(User::getId).distinct().toList());
+        Set<String> realUserIds = users.stream().map(User::getId).collect(Collectors.toSet());
         //如果是admin用户，为特殊用户，将admin加入
         if (userIds.contains("admin")) {
             realUserIds.add("admin");
@@ -84,7 +80,7 @@ protected List<String> getResourceUserIds(List<String> userIds, String organizat
         }
     }
 
-    protected List<Receiver> getReceivers(List<Receiver> receivers, Boolean excludeSelf, String operator) {
+    protected List<Receiver> getReceivers(List<Receiver> receivers, boolean excludeSelf, String operator) {
         // 排除自己
         List<Receiver> realReceivers = new ArrayList<>();
         if (excludeSelf) {

backend/crm/src/main/java/cn/cordys/crm/system/notice/sender/insite/InSiteNoticeSender.java

@@ -70,7 +70,6 @@ public void sendAnnouncement(MessageDetailDTO messageDetailDTO, NoticeModel noti
             }
             notification.setType(receiver.getType());
             notification.setStatus(NotificationConstants.Status.UNREAD.name());
-            notification.setCreateTime(System.currentTimeMillis());
             notification.setReceiver(receiver.getUserId());
             notification.setContent(context.getBytes());
             notification.setCreateUser(noticeModel.getOperator());
@@ -80,17 +79,18 @@ public void sendAnnouncement(MessageDetailDTO messageDetailDTO, NoticeModel noti
             notificationBaseMapper.insert(notification);
             String messageText = JSON.toJSONString(notification);
             //储存信息
-            stringRedisTemplate.opsForZSet().add(USER_PREFIX + receiver.getUserId(), id, System.currentTimeMillis());
+            String userRedisKey = USER_PREFIX + receiver.getUserId();
+            stringRedisTemplate.opsForZSet().add(userRedisKey, id, System.currentTimeMillis());
             stringRedisTemplate.opsForValue().set(MSG_PREFIX + id, messageText);
-            // 限制 Redis 只存 5 条消息
+            // 限制 Redis 只存 5 条消息：移除排名 5 之后的所有条目
             Set<String> oldNotificationIds = stringRedisTemplate.opsForZSet()
-                    .reverseRange(USER_PREFIX + receiver.getUserId(), 4, -1);
+                    .reverseRange(userRedisKey, 4, -1);
             if (CollectionUtils.isNotEmpty(oldNotificationIds)) {
-                for (String oldNotificationId : oldNotificationIds) {
-                    stringRedisTemplate.delete(MSG_PREFIX + oldNotificationId);
-                }
+                stringRedisTemplate.delete(oldNotificationIds.stream()
+                        .map(nid -> MSG_PREFIX + nid)
+                        .toList());
+                stringRedisTemplate.opsForZSet().removeRange(userRedisKey, 0, -6);
             }
-            stringRedisTemplate.opsForZSet().removeRange(USER_PREFIX + receiver.getUserId(), 0, -6);
             //更新用户的已读全部消息状态 0 为未读，1为已读
             stringRedisTemplate.opsForValue().set(USER_READ_PREFIX + receiver.getUserId(), "False");
 

backend/crm/src/main/java/cn/cordys/crm/system/notice/sse/SseService.java

@@ -21,6 +21,7 @@
 
 import java.time.Duration;
 import java.util.*;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Service
@@ -155,12 +156,18 @@ private List<NotificationDTO> buildDTOList(Set<String> values, String prefix) {
                 .map(val -> stringRedisTemplate.opsForValue().get(prefix + val))
                 .filter(StringUtils::isNotBlank)
                 .map(json -> {
-                    Notification notification = JSON.parseObject(json, Notification.class);
-                    NotificationDTO dto = new NotificationDTO();
-                    BeanUtils.copyBean(dto, notification);
-                    dto.setContentText(new String(notification.getContent()));
-                    return dto;
+                    try {
+                        Notification notification = JSON.parseObject(json, Notification.class);
+                        NotificationDTO dto = new NotificationDTO();
+                        BeanUtils.copyBean(dto, notification);
+                        dto.setContentText(new String(notification.getContent()));
+                        return dto;
+                    } catch (Exception e) {
+                        log.warn("Failed to parse notification from Redis: {}", e.getMessage());
+                        return null;
+                    }
                 })
+                .filter(Objects::nonNull)
                 .sorted(Comparator.comparing(NotificationDTO::getCreateTime).reversed())
                 .toList();
     }