修复双人年度报告相关

electron/main.ts

@@ -985,8 +985,8 @@ function registerIpcHandlers() {
     return analyticsService.getOverallStatistics(force)
   })
 
-  ipcMain.handle('analytics:getContactRankings', async (_, limit?: number) => {
-    return analyticsService.getContactRankings(limit)
+  ipcMain.handle('analytics:getContactRankings', async (_, limit?: number, beginTimestamp?: number, endTimestamp?: number) => {
+    return analyticsService.getContactRankings(limit, beginTimestamp, endTimestamp)
   })
 
   ipcMain.handle('analytics:getTimeDistribution', async () => {

electron/preload.ts

@@ -189,7 +189,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
   // 数据分析
   analytics: {
     getOverallStatistics: (force?: boolean) => ipcRenderer.invoke('analytics:getOverallStatistics', force),
-    getContactRankings: (limit?: number) => ipcRenderer.invoke('analytics:getContactRankings', limit),
+    getContactRankings: (limit?: number, beginTimestamp?: number, endTimestamp?: number) =>
+      ipcRenderer.invoke('analytics:getContactRankings', limit, beginTimestamp, endTimestamp),
     getTimeDistribution: () => ipcRenderer.invoke('analytics:getTimeDistribution'),
     getExcludedUsernames: () => ipcRenderer.invoke('analytics:getExcludedUsernames'),
     setExcludedUsernames: (usernames: string[]) => ipcRenderer.invoke('analytics:setExcludedUsernames', usernames),

electron/services/analyticsService.ts

@@ -31,6 +31,7 @@ export interface ContactRanking {
   username: string
   displayName: string
   avatarUrl?: string
+  wechatId?: string
   messageCount: number
   sentCount: number
   receivedCount: number
@@ -576,7 +577,11 @@ class AnalyticsService {
     }
   }
 
-  async getContactRankings(limit: number = 20): Promise<{ success: boolean; data?: ContactRanking[]; error?: string }> {
+  async getContactRankings(
+    limit: number = 20,
+    beginTimestamp: number = 0,
+    endTimestamp: number = 0
+  ): Promise<{ success: boolean; data?: ContactRanking[]; error?: string }> {
     try {
       const conn = await this.ensureConnected()
       if (!conn.success || !conn.cleanedWxid) return { success: false, error: conn.error }
@@ -586,7 +591,7 @@ class AnalyticsService {
         return { success: false, error: '未找到消息会话' }
       }
 
-      const result = await this.getAggregateWithFallback(sessionInfo.usernames, 0, 0)
+      const result = await this.getAggregateWithFallback(sessionInfo.usernames, beginTimestamp, endTimestamp)
       if (!result.success || !result.data) {
         return { success: false, error: result.error || '聚合统计失败' }
       }
@@ -594,9 +599,10 @@ class AnalyticsService {
       const d = result.data
       const sessions = this.normalizeAggregateSessions(d.sessions, d.idMap)
       const usernames = Object.keys(sessions)
-      const [displayNames, avatarUrls] = await Promise.all([
+      const [displayNames, avatarUrls, aliasMap] = await Promise.all([
         wcdbService.getDisplayNames(usernames),
-        wcdbService.getAvatarUrls(usernames)
+        wcdbService.getAvatarUrls(usernames),
+        this.getAliasMap(usernames)
       ])
 
       const rankings: ContactRanking[] = usernames
@@ -608,10 +614,13 @@ class AnalyticsService {
           const avatarUrl = avatarUrls.success && avatarUrls.map
             ? avatarUrls.map[username]
             : undefined
+          const alias = aliasMap[username] || ''
+          const wechatId = alias || (!username.startsWith('wxid_') ? username : '')
           return {
             username,
             displayName,
             avatarUrl,
+            wechatId,
             messageCount: stat.total,
             sentCount: stat.sent,
             receivedCount: stat.received,

electron/services/dualReportService.ts

@@ -26,13 +26,17 @@ export interface DualReportStats {
   friendTopEmojiMd5?: string
   myTopEmojiUrl?: string
   friendTopEmojiUrl?: string
+  myTopEmojiCount?: number
+  friendTopEmojiCount?: number
 }
 
 export interface DualReportData {
   year: number
   selfName: string
+  selfAvatarUrl?: string
   friendUsername: string
   friendName: string
+  friendAvatarUrl?: string
   firstChat: DualReportFirstChat | null
   firstChatMessages?: DualReportMessage[]
   yearFirstChat?: {
@@ -276,6 +280,18 @@ class DualReportService {
       if (myName === rawWxid && cleanedWxid && cleanedWxid !== rawWxid) {
         myName = await this.getDisplayName(cleanedWxid, rawWxid)
       }
+      const avatarCandidates = Array.from(new Set([
+        friendUsername,
+        rawWxid,
+        cleanedWxid
+      ].filter(Boolean) as string[]))
+      let selfAvatarUrl: string | undefined
+      let friendAvatarUrl: string | undefined
+      const avatarResult = await wcdbService.getAvatarUrls(avatarCandidates)
+      if (avatarResult.success && avatarResult.map) {
+        selfAvatarUrl = avatarResult.map[rawWxid] || avatarResult.map[cleanedWxid]
+        friendAvatarUrl = avatarResult.map[friendUsername]
+      }
 
       this.reportProgress('获取首条聊天记录...', 15, onProgress)
       const firstRows = await this.getFirstMessages(friendUsername, 3, 0, 0)
@@ -391,6 +407,8 @@ class DualReportService {
       stats.myTopEmojiUrl = myTopEmojiUrl
       stats.friendTopEmojiMd5 = friendTopEmojiMd5
       stats.friendTopEmojiUrl = friendTopEmojiUrl
+      if (myTopCount >= 0) stats.myTopEmojiCount = myTopCount
+      if (friendTopCount >= 0) stats.friendTopEmojiCount = friendTopCount
 
       const topPhrases = (cppData.phrases || []).map((p: any) => ({
         phrase: p.phrase,
@@ -401,8 +419,10 @@ class DualReportService {
       const reportData: DualReportData = {
         year: reportYear,
         selfName: myName,
+        selfAvatarUrl,
         friendUsername,
         friendName,
+        friendAvatarUrl,
         firstChat,
         firstChatMessages,
         yearFirstChat,