feat: add paginated notification APIs and frontend

backend/src/main/java/com/openisle/controller/NotificationController.java

@@ -23,9 +23,17 @@ public class NotificationController {
     private final NotificationMapper notificationMapper;
 
     @GetMapping
-    public List<NotificationDto> list(@RequestParam(value = "read", required = false) Boolean read,
+    public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
                                       Authentication auth) {
-        return notificationService.listNotifications(auth.getName(), read).stream()
+        return notificationService.listNotifications(auth.getName(), null, page).stream()
+                .map(notificationMapper::toDto)
+                .collect(Collectors.toList());
+    }
+
+    @GetMapping("/unread")
+    public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
+                                            Authentication auth) {
+        return notificationService.listNotifications(auth.getName(), false, page).stream()
                 .map(notificationMapper::toDto)
                 .collect(Collectors.toList());
     }

backend/src/main/java/com/openisle/repository/NotificationRepository.java

@@ -5,6 +5,8 @@ import com.openisle.model.User;
 import com.openisle.model.Post;
 import com.openisle.model.Comment;
 import com.openisle.model.NotificationType;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
@@ -13,6 +15,8 @@ import java.util.List;
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
     List<Notification> findByUserOrderByCreatedAtDesc(User user);
     List<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read);
+    Page<Notification> findByUserOrderByCreatedAtDesc(User user, Pageable pageable);
+    Page<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read, Pageable pageable);
     long countByUserAndRead(User user, boolean read);
     List<Notification> findByPost(Post post);
     List<Notification> findByComment(Comment comment);

backend/src/main/java/com/openisle/service/NotificationService.java

@@ -180,15 +180,16 @@ public class NotificationService {
         userRepository.save(user);
     }
 
-    public List<Notification> listNotifications(String username, Boolean read) {
+    public List<Notification> listNotifications(String username, Boolean read, int page) {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
         Set<NotificationType> disabled = user.getDisabledNotificationTypes();
         List<Notification> list;
+        var pageable = org.springframework.data.domain.PageRequest.of(page, 50);
         if (read == null) {
-            list = notificationRepository.findByUserOrderByCreatedAtDesc(user);
+            list = notificationRepository.findByUserOrderByCreatedAtDesc(user, pageable).getContent();
         } else {
-            list = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read);
+            list = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read, pageable).getContent();
         }
         return list.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
     }

frontend_nuxt/pages/message.vue

@@ -53,13 +53,13 @@
       </div>
 
       <BasePlaceholder
-        v-else-if="filteredNotifications.length === 0"
+        v-else-if="displayNotifications.length === 0"
         text="暂时没有消息 :)"
         icon="fas fa-inbox"
       />
 
-      <div class="timeline-container" v-if="filteredNotifications.length > 0">
+      <div class="timeline-container" v-if="displayNotifications.length > 0">
-        <BaseTimeline :items="filteredNotifications">
+        <BaseTimeline :items="displayNotifications">
           <template #item="{ item }">
             <div class="notif-content" :class="{ read: item.read }">
               <span v-if="!item.read" class="unread-dot"></span>
@@ -506,25 +506,39 @@
           </template>
         </BaseTimeline>
       </div>
+
+      <InfiniteLoadMore
+        v-if="displayNotifications.length > 0"
+        :key="ioKey"
+        :on-load="fetchNextPage"
+        :pause="isLoadingMessage"
+        root-margin="200px 0px"
+      />
     </template>
   </div>
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onActivated, ref, watch } from 'vue'
 import BasePlaceholder from '~/components/BasePlaceholder.vue'
 import BaseTimeline from '~/components/BaseTimeline.vue'
 import NotificationContainer from '~/components/NotificationContainer.vue'
 import { toast } from '~/main'
 import { authState, getToken } from '~/utils/auth'
 import { stripMarkdownLength } from '~/utils/markdown'
+import InfiniteLoadMore from '~/components/InfiniteLoadMore.vue'
 import {
-  fetchNotifications,
+  fetchAllNotifications,
+  fetchUnreadNotifications,
   fetchUnreadCount,
-  isLoadingMessage,
+  isLoadingAll,
+  isLoadingUnread,
   markRead,
-  notifications,
+  allNotifications,
+  unreadNotifications,
   markAllRead,
+  resetAll,
+  resetUnread,
 } from '~/utils/notification'
 import TimeManager from '~/utils/time'
 
@@ -535,9 +549,24 @@ const selectedTab = ref(
   ['all', 'unread', 'control'].includes(route.query.tab) ? route.query.tab : 'unread',
 )
 const notificationPrefs = ref([])
-const filteredNotifications = computed(() =>
+const displayNotifications = computed(() =>
-  selectedTab.value === 'all' ? notifications.value : notifications.value.filter((n) => !n.read),
+  selectedTab.value === 'all' ? allNotifications.value : unreadNotifications.value,
 )
+const isLoadingMessage = computed(() =>
+  selectedTab.value === 'all' ? isLoadingAll.value : isLoadingUnread.value,
+)
+const ioKey = ref(0)
+
+const fetchNextPage = () =>
+  selectedTab.value === 'all' ? fetchAllNotifications() : fetchUnreadNotifications()
+
+const loadInitial = async () => {
+  if (selectedTab.value === 'all') {
+    if (allNotifications.value.length === 0) await fetchAllNotifications()
+  } else if (selectedTab.value === 'unread') {
+    if (unreadNotifications.value.length === 0) await fetchUnreadNotifications()
+  }
+}
 
 const fetchPrefs = async () => {
   notificationPrefs.value = await fetchNotificationPreferences()
@@ -547,7 +576,9 @@ const togglePref = async (pref) => {
   const ok = await updateNotificationPreference(pref.type, !pref.enabled)
   if (ok) {
     pref.enabled = !pref.enabled
-    await fetchNotifications()
+    resetAll()
+    resetUnread()
+    await loadInitial()
     await fetchUnreadCount()
   } else {
     toast.error('操作失败')
@@ -627,8 +658,13 @@ const formatType = (t) => {
   }
 }
 
+watch(selectedTab, async () => {
+  await loadInitial()
+  ioKey.value++
+})
+
 onActivated(() => {
-  fetchNotifications()
+  loadInitial()
   fetchPrefs()
 })
 </script>

frontend_nuxt/utils/notification.js

@@ -4,9 +4,7 @@ import { toast } from '~/composables/useToast'
 import { authState, getToken } from '~/utils/auth'
 import { reactionEmojiMap } from '~/utils/reactions'
 
-export const notificationState = reactive({
+export const notificationState = reactive({ unreadCount: 0 })
-  unreadCount: 0,
-})
 
 const iconMap = {
   POST_VIEWED: 'fas fa-eye',
@@ -57,7 +55,6 @@ export async function markNotificationsRead(ids) {
   try {
     const config = useRuntimeConfig()
     const API_BASE_URL = config.public.apiBaseUrl
-
     const token = getToken()
     if (!token || !ids || ids.length === 0) return false
     const res = await fetch(`${API_BASE_URL}/api/notifications/read`, {
@@ -78,7 +75,6 @@ export async function fetchNotificationPreferences() {
   try {
     const config = useRuntimeConfig()
     const API_BASE_URL = config.public.apiBaseUrl
-
     const token = getToken()
     if (!token) return []
     const res = await fetch(`${API_BASE_URL}/api/notifications/prefs`, {
@@ -112,193 +108,219 @@ export async function updateNotificationPreference(type, enabled) {
 }
 
 /**
- * 处理信息的高阶函数
+ * 提供通知列表的分页获取与状态管理
- * @returns
  */
 function createFetchNotifications() {
-  const notifications = ref([])
+  const allNotifications = ref([])
-  const isLoadingMessage = ref(false)
+  const unreadNotifications = ref([])
-  const fetchNotifications = async () => {
+  const pageAll = ref(0)
-    const config = useRuntimeConfig()
+  const pageUnread = ref(0)
-    const API_BASE_URL = config.public.apiBaseUrl
+  const isLoadingAll = ref(false)
-    if (isLoadingMessage && notifications && markRead) {
+  const isLoadingUnread = ref(false)
-      try {
+
-        const token = getToken()
+  const processAndPush = (data, target) => {
-        if (!token) {
+    for (const n of data) {
-          toast.error('请先登录')
+      if (n.type === 'COMMENT_REPLY') {
-          return
+        target.push({
-        }
+          ...n,
-        isLoadingMessage.value = true
+          src: n.comment.author.avatar,
-        notifications.value = []
+          iconClick: () => {
-        const res = await fetch(`${API_BASE_URL}/api/notifications`, {
+            markRead(n.id)
-          headers: {
+            navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-            Authorization: `Bearer ${token}`,
           },
         })
-        isLoadingMessage.value = false
+      } else if (n.type === 'REACTION') {
-        if (!res.ok) {
+        target.push({
-          toast.error('获取通知失败')
+          ...n,
-          return
+          emoji: reactionEmojiMap[n.reactionType],
-        }
+          iconClick: () => {
-        const data = await res.json()
+            if (n.fromUser) {
-
+              markRead(n.id)
-        for (const n of data) {
+              navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-          if (n.type === 'COMMENT_REPLY') {
+            }
-            notifications.value.push({
+          },
-              ...n,
+        })
-              src: n.comment.author.avatar,
+      } else if (n.type === 'POST_VIEWED') {
-              iconClick: () => {
+        target.push({
-                markRead(n.id)
+          ...n,
-                navigateTo(`/users/${n.comment.author.id}`, { replace: true })
+          src: n.fromUser ? n.fromUser.avatar : null,
-              },
+          icon: n.fromUser ? undefined : iconMap[n.type],
-            })
+          iconClick: () => {
-          } else if (n.type === 'REACTION') {
+            if (n.fromUser) {
-            notifications.value.push({
+              markRead(n.id)
-              ...n,
+              navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-              emoji: reactionEmojiMap[n.reactionType],
+            }
-              iconClick: () => {
+          },
-                if (n.fromUser) {
+        })
-                  markRead(n.id)
+      } else if (n.type === 'LOTTERY_WIN') {
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+        target.push({
-                }
+          ...n,
-              },
+          icon: iconMap[n.type],
-            })
+          iconClick: () => {
-          } else if (n.type === 'POST_VIEWED') {
+            if (n.post) {
-            notifications.value.push({
+              markRead(n.id)
-              ...n,
+              navigateTo(`/posts/${n.post.id}`, { replace: true })
-              src: n.fromUser ? n.fromUser.avatar : null,
+            }
-              icon: n.fromUser ? undefined : iconMap[n.type],
+          },
-              iconClick: () => {
+        })
-                if (n.fromUser) {
+      } else if (n.type === 'LOTTERY_DRAW') {
-                  markRead(n.id)
+        target.push({
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+          ...n,
-                }
+          icon: iconMap[n.type],
-              },
+          iconClick: () => {
-            })
+            if (n.post) {
-          } else if (n.type === 'LOTTERY_WIN') {
+              markRead(n.id)
-            notifications.value.push({
+              navigateTo(`/posts/${n.post.id}`, { replace: true })
-              ...n,
+            }
-              icon: iconMap[n.type],
+          },
-              iconClick: () => {
+        })
-                if (n.post) {
+      } else if (n.type === 'POST_UPDATED') {
-                  markRead(n.id)
+        target.push({
-                  router.push(`/posts/${n.post.id}`)
+          ...n,
-                }
+          src: n.comment.author.avatar,
-              },
+          iconClick: () => {
-            })
+            markRead(n.id)
-          } else if (n.type === 'LOTTERY_DRAW') {
+            navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-            notifications.value.push({
+          },
-              ...n,
+        })
-              icon: iconMap[n.type],
+      } else if (n.type === 'USER_ACTIVITY') {
-              iconClick: () => {
+        target.push({
-                if (n.post) {
+          ...n,
-                  markRead(n.id)
+          src: n.comment.author.avatar,
-                  router.push(`/posts/${n.post.id}`)
+          iconClick: () => {
-                }
+            markRead(n.id)
-              },
+            navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-            })
+          },
-          } else if (n.type === 'POST_UPDATED') {
+        })
-            notifications.value.push({
+      } else if (n.type === 'MENTION') {
-              ...n,
+        target.push({
-              src: n.comment.author.avatar,
+          ...n,
-              iconClick: () => {
+          icon: iconMap[n.type],
-                markRead(n.id)
+          iconClick: () => {
-                navigateTo(`/users/${n.comment.author.id}`, { replace: true })
+            if (n.fromUser) {
-              },
+              markRead(n.id)
-            })
+              navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-          } else if (n.type === 'USER_ACTIVITY') {
+            }
-            notifications.value.push({
+          },
-              ...n,
+        })
-              src: n.comment.author.avatar,
+      } else if (n.type === 'USER_FOLLOWED' || n.type === 'USER_UNFOLLOWED') {
-              iconClick: () => {
+        target.push({
-                markRead(n.id)
+          ...n,
-                navigateTo(`/users/${n.comment.author.id}`, { replace: true })
+          icon: iconMap[n.type],
-              },
+          iconClick: () => {
-            })
+            if (n.fromUser) {
-          } else if (n.type === 'MENTION') {
+              markRead(n.id)
-            notifications.value.push({
+              navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-              ...n,
+            }
-              icon: iconMap[n.type],
+          },
-              iconClick: () => {
+        })
-                if (n.fromUser) {
+      } else if (n.type === 'FOLLOWED_POST') {
-                  markRead(n.id)
+        target.push({
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+          ...n,
-                }
+          icon: iconMap[n.type],
-              },
+          iconClick: () => {
-            })
+            if (n.post) {
-          } else if (n.type === 'USER_FOLLOWED' || n.type === 'USER_UNFOLLOWED') {
+              markRead(n.id)
-            notifications.value.push({
+              navigateTo(`/posts/${n.post.id}`, { replace: true })
-              ...n,
+            }
-              icon: iconMap[n.type],
+          },
-              iconClick: () => {
+        })
-                if (n.fromUser) {
+      } else if (n.type === 'POST_SUBSCRIBED' || n.type === 'POST_UNSUBSCRIBED') {
-                  markRead(n.id)
+        target.push({
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+          ...n,
-                }
+          icon: iconMap[n.type],
-              },
+          iconClick: () => {
-            })
+            if (n.post) {
-          } else if (n.type === 'FOLLOWED_POST') {
+              markRead(n.id)
-            notifications.value.push({
+              navigateTo(`/posts/${n.post.id}`, { replace: true })
-              ...n,
+            }
-              icon: iconMap[n.type],
+          },
-              iconClick: () => {
+        })
-                if (n.post) {
+      } else if (n.type === 'POST_REVIEW_REQUEST') {
-                  markRead(n.id)
+        target.push({
-                  navigateTo(`/posts/${n.post.id}`, { replace: true })
+          ...n,
-                }
+          src: n.fromUser ? n.fromUser.avatar : null,
-              },
+          icon: n.fromUser ? undefined : iconMap[n.type],
-            })
+          iconClick: () => {
-          } else if (n.type === 'POST_SUBSCRIBED' || n.type === 'POST_UNSUBSCRIBED') {
+            if (n.post) {
-            notifications.value.push({
+              markRead(n.id)
-              ...n,
+              navigateTo(`/posts/${n.post.id}`, { replace: true })
-              icon: iconMap[n.type],
+            }
-              iconClick: () => {
+          },
-                if (n.post) {
+        })
-                  markRead(n.id)
+      } else if (n.type === 'REGISTER_REQUEST') {
-                  navigateTo(`/posts/${n.post.id}`, { replace: true })
+        target.push({
-                }
+          ...n,
-              },
+          icon: iconMap[n.type],
-            })
+          iconClick: () => {},
-          } else if (n.type === 'POST_REVIEW_REQUEST') {
+        })
-            notifications.value.push({
+      } else {
-              ...n,
+        target.push({
-              src: n.fromUser ? n.fromUser.avatar : null,
+          ...n,
-              icon: n.fromUser ? undefined : iconMap[n.type],
+          icon: iconMap[n.type],
-              iconClick: () => {
+        })
-                if (n.post) {
-                  markRead(n.id)
-                  navigateTo(`/posts/${n.post.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'REGISTER_REQUEST') {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-              iconClick: () => {},
-            })
-          } else {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-            })
-          }
-        }
-      } catch (e) {
-        console.error(e)
       }
     }
   }
 
+  const fetchAllNotifications = async () => {
+    const config = useRuntimeConfig()
+    const API_BASE_URL = config.public.apiBaseUrl
+    const token = getToken()
+    if (!token) {
+      toast.error('请先登录')
+      return { done: true }
+    }
+    isLoadingAll.value = true
+    const res = await fetch(`${API_BASE_URL}/api/notifications?page=${pageAll.value}`, {
+      headers: { Authorization: `Bearer ${token}` },
+    })
+    isLoadingAll.value = false
+    if (!res.ok) {
+      toast.error('获取通知失败')
+      return { done: true }
+    }
+    const data = await res.json()
+    processAndPush(data, allNotifications.value)
+    pageAll.value++
+    return { done: data.length < 50 }
+  }
+
+  const fetchUnreadNotifications = async () => {
+    const config = useRuntimeConfig()
+    const API_BASE_URL = config.public.apiBaseUrl
+    const token = getToken()
+    if (!token) {
+      toast.error('请先登录')
+      return { done: true }
+    }
+    isLoadingUnread.value = true
+    const res = await fetch(`${API_BASE_URL}/api/notifications/unread?page=${pageUnread.value}`, {
+      headers: { Authorization: `Bearer ${token}` },
+    })
+    isLoadingUnread.value = false
+    if (!res.ok) {
+      toast.error('获取通知失败')
+      return { done: true }
+    }
+    const data = await res.json()
+    processAndPush(data, unreadNotifications.value)
+    pageUnread.value++
+    return { done: data.length < 50 }
+  }
+
   const markRead = async (id) => {
     if (!id) return
-    const n = notifications.value.find((n) => n.id === id)
+    const nAll = allNotifications.value.find((n) => n.id === id)
-    if (!n || n.read) return
+    const idxUnread = unreadNotifications.value.findIndex((n) => n.id === id)
-    n.read = true
+    const unreadItem = idxUnread !== -1 ? unreadNotifications.value[idxUnread] : null
+    if (nAll) nAll.read = true
+    if (idxUnread !== -1) unreadNotifications.value.splice(idxUnread, 1)
     if (notificationState.unreadCount > 0) notificationState.unreadCount--
     const ok = await markNotificationsRead([id])
     if (!ok) {
-      n.read = false
+      if (nAll) nAll.read = false
+      if (idxUnread !== -1 && unreadItem) unreadNotifications.value.splice(idxUnread, 0, unreadItem)
       notificationState.unreadCount++
     } else {
       fetchUnreadCount()
@@ -306,20 +328,28 @@ function createFetchNotifications() {
   }
 
   const markAllRead = async () => {
-    // 除了 REGISTER_REQUEST 类型消息
+    const idsToMark = [
-    const idsToMark = notifications.value
+      ...new Set(
-      .filter((n) => n.type !== 'REGISTER_REQUEST' && !n.read)
+        [...allNotifications.value, ...unreadNotifications.value]
-      .map((n) => n.id)
+          .filter((n) => n.type !== 'REGISTER_REQUEST' && !n.read)
+          .map((n) => n.id),
+      ),
+    ]
     if (idsToMark.length === 0) return
-    notifications.value.forEach((n) => {
+    allNotifications.value.forEach((n) => {
       if (n.type !== 'REGISTER_REQUEST') n.read = true
     })
-    notificationState.unreadCount = notifications.value.filter((n) => !n.read).length
+    const prevUnread = [...unreadNotifications.value]
+    unreadNotifications.value = unreadNotifications.value.filter(
+      (n) => n.type === 'REGISTER_REQUEST',
+    )
+    notificationState.unreadCount = unreadNotifications.value.length
     const ok = await markNotificationsRead(idsToMark)
     if (!ok) {
-      notifications.value.forEach((n) => {
+      allNotifications.value.forEach((n) => {
         if (idsToMark.includes(n.id)) n.read = false
       })
+      unreadNotifications.value = prevUnread
       await fetchUnreadCount()
       return
     }
@@ -330,15 +360,40 @@ function createFetchNotifications() {
       toast.success('已读所有消息')
     }
   }
+
+  const resetAll = () => {
+    pageAll.value = 0
+    allNotifications.value = []
+  }
+
+  const resetUnread = () => {
+    pageUnread.value = 0
+    unreadNotifications.value = []
+  }
+
   return {
-    fetchNotifications,
+    fetchAllNotifications,
-    markRead,
+    fetchUnreadNotifications,
-    notifications,
-    isLoadingMessage,
     markRead,
     markAllRead,
+    allNotifications,
+    unreadNotifications,
+    isLoadingAll,
+    isLoadingUnread,
+    resetAll,
+    resetUnread,
   }
 }
 
-export const { fetchNotifications, markRead, notifications, isLoadingMessage, markAllRead } =
+export const {
-  createFetchNotifications()
+  fetchAllNotifications,
+  fetchUnreadNotifications,
+  markRead,
+  markAllRead,
+  allNotifications,
+  unreadNotifications,
+  isLoadingAll,
+  isLoadingUnread,
+  resetAll,
+  resetUnread,
+} = createFetchNotifications()