daynumber的bug修正

scripts/backfill_2months.mjs

@@ -0,0 +1,92 @@
+// 补齐近两个月：有学习记录(Flag=0)但缺 MiaoguoTask 记录的练习日，并对受影响用户完整重算 DayNumber/里程碑/勤勉号。
+import moment from 'moment';
+import Miaoguo from '../src/model/miaoguo.js';
+import constantClass from '../src/util/constant/index.js';
+import { stringUtils } from '../src/util/stringClass.js';
+
+const startDate = new Date(Date.now() - 60 * 86400000).toISOString().slice(0, 10);
+const dayKey = (x) => moment(x.CreateTime).format('YYYY-MM-DD');
+const score = (x) => (x.IsShare > 0 ? 4 : 0) + (x.MilestoneDayNumber > 0 ? 2 : 0) + (x.AphorismID > 0 ? 1 : 0);
+
+// 1) 找出缺失的练习日
+const missing = await Miaoguo.RunSql([startDate], `
+    SELECT mc.UserID, DATE_FORMAT(r.CreateTime,'%Y-%m-%d') d,
+           COUNT(DISTINCT r.CardID) CardCount, SUM(r.Duration) Duration
+    FROM MiaoguoLearningRecord r
+    INNER JOIN MiaoguoCard mc ON mc.MiaoguoCardID = r.CardID
+    LEFT JOIN MiaoguoTask t ON t.UserID = mc.UserID AND DATE(t.CreateTime) = DATE(r.CreateTime)
+    WHERE r.Flag=0 AND r.CreateTime >= ? AND t.ID IS NULL
+    GROUP BY mc.UserID, DATE_FORMAT(r.CreateTime,'%Y-%m-%d')
+    ORDER BY mc.UserID, d;`);
+
+console.log('待补齐的练习日:', missing.length, '涉及用户:', [...new Set(missing.map(r => r.UserID))].length);
+if (missing.length === 0) process.exit(0);
+
+const byUser = new Map();
+for (const r of missing) {
+    if (!byUser.has(r.UserID)) byUser.set(r.UserID, []);
+    byUser.get(r.UserID).push(r);
+}
+
+// 2) 插入缺失行（带存在性保护）
+let inserted = 0;
+for (const [userID, days] of byUser) {
+    for (const d of days) {
+        const createTime = d.d + ' 00:00:00';
+        await Miaoguo.RunSql([userID, createTime, d.CardCount, d.Duration, userID, createTime],
+            "insert into MiaoguoTask (UserID,CreateTime,CardTask,Duration,IsShare,Flag) " +
+            "select ?,?,?,?,0,0 from dual where not exists " +
+            "(select UserID,CreateTime from MiaoguoTask where UserID=? and CreateTime=?) limit 1;");
+        inserted++;
+    }
+    console.log(`U${userID}: 补插 ${days.length} 天 ->`, days.map(x => x.d).join(','));
+}
+console.log('补插完成，共', inserted, '天。\n');
+
+// 3) 对受影响用户完整重算（与夜间重算一致）
+const users = [...byUser.keys()].map(Number);
+const placeholders = users.map(() => '?').join(',');
+await Miaoguo.RunSql(users, `update MiaoguoTask set MilestoneID=0,MilestoneDayNumber=0,HardworkingNumber=0 where UserID in (${placeholders});`);
+
+const milestone = constantClass.GetMilestone();
+for (const userID of users) {
+    const tasks = await Miaoguo.RunSql([userID],
+        "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime, ID desc;");
+    if (!tasks || tasks.length === 0) continue;
+
+    const dayBest = new Map();
+    for (const t of tasks) {
+        const key = dayKey(t);
+        const best = dayBest.get(key);
+        if (!best) dayBest.set(key, t);
+        else if (score(t) > score(best) || (score(t) === score(best) && t.ID > best.ID))
+            dayBest.set(key, t);
+    }
+    for (const t of tasks) {
+        if (dayBest.get(dayKey(t)).ID !== t.ID)
+            await Miaoguo.RunSql([t.ID], "delete from MiaoguoTask where ID=?;");
+    }
+    const dayTasks = [...dayBest.values()].sort((a, b) =>
+        a.CreateTime < b.CreateTime ? -1 : a.CreateTime > b.CreateTime ? 1 : a.ID - b.ID);
+
+    let milestoneIDs = [];
+    for (let i = 0; i < 40; i++) milestoneIDs.push(i + 1);
+    milestoneIDs = stringUtils.RandomArray(milestoneIDs);
+    let milestoneIndex = 0, hardworkingIndex = 0;
+    for (let i = 0; i < dayTasks.length; i++) {
+        const t = dayTasks[i];
+        const update = { ID: t.ID, DayNumber: i + 1 };
+        const milestoneItem = milestone.find(item => item.DayNumber == i + 1);
+        if (milestoneItem) {
+            update.MilestoneDayNumber = milestoneItem.DayNumber;
+            update.MilestoneID = milestoneIDs[milestoneIndex++];
+        }
+        if (t.IsShare > 0 || update.MilestoneDayNumber > 0 || t.AphorismID > 0)
+            update.HardworkingNumber = ++hardworkingIndex;
+        await Miaoguo.UpdateMiaoguoTask(update);
+    }
+    console.log(`U${userID}: 重算完成，共 ${dayTasks.length} 天 (1..${dayTasks.length})`);
+}
+
+console.log('\n全部补齐完成。');
+process.exit(0);

scripts/check_658.mjs

@@ -0,0 +1,27 @@
+import Miaoguo from '../src/model/miaoguo.js';
+
+const startDate = new Date(Date.now() - 30 * 86400000).toISOString().slice(0, 10);
+console.log('startDate =', startDate);
+
+// 重算的真实用户集合（与 updateMiaoguoTaskData 完全一致的 SQL）
+const users = await Miaoguo.RunSql([startDate],
+    "select distinct mc.UserID from MiaoguoLearningRecord mlr inner join MiaoguoCard mc on mc.MiaoguoCardID=mlr.CardID where mlr.Flag=0 and mlr.CreateTime>=?;");
+const ids = users.map(u => Number(u.UserID));
+console.log('重算用户集合数量:', ids.length);
+console.log('658 是否在重算集合中:', ids.includes(658));
+
+// 658 最近一个月的学习记录（Flag=0）
+const lr = await Miaoguo.RunSql([658, startDate],
+    "select count(*) as c, max(mlr.CreateTime) as lastTime from MiaoguoLearningRecord mlr inner join MiaoguoCard mc on mc.MiaoguoCardID=mlr.CardID where mlr.Flag=0 and mc.UserID=? and mlr.CreateTime>=?;");
+console.log('658 近30天 Flag=0 学习记录:', JSON.stringify(lr[0]));
+
+// 658 的 DayNumber=0 记录数
+const zero = await Miaoguo.RunSql([658],
+    "select count(*) as total, sum(case when DayNumber=0 then 1 else 0 end) as zeroCnt, max(CreateTime) as lastTask from MiaoguoTask where CardTask>0 and UserID=?;");
+console.log('658 任务总数/其中Day=0/最后一天:', JSON.stringify(zero[0]));
+
+// 全库最近30天有任务但 DayNumber=0 的用户规模
+const scope = await Miaoguo.RunSql([startDate],
+    "select count(distinct UserID) as users from MiaoguoTask where CardTask>0 and CreateTime>=? and DayNumber=0;");
+console.log('近30天存在 DayNumber=0 记录的用户数:', JSON.stringify(scope[0]));
+process.exit(0);

scripts/diag_milestone.mjs

@@ -0,0 +1,11 @@
+import constantClass from '../src/util/constant/index.js';
+
+const m = constantClass.GetMilestone();
+console.log('里程碑条目数:', m.length);
+console.log('各 DayNumber:', m.map(x => x.DayNumber).join(','));
+
+// 检查 milestoneIDs 只有 40 个，但命中里程碑超过 40 次就会越界
+const maxHits = m.length;
+console.log('若用户命中里程碑次数 > 40，则 milestoneIDs 越界 -> undefined');
+console.log('是否可能越界:', maxHits > 40);
+process.exit(0);

scripts/dump_658.mjs

@@ -0,0 +1,16 @@
+import Miaoguo from '../src/model/miaoguo.js';
+
+const r = await Miaoguo.RunSql([658],
+    'SELECT ID,CreateTime,DayNumber,CardTask,IsShare,HardworkingNumber,MilestoneDayNumber,AphorismID FROM MiaoguoTask where UserID=658 and ID>384493 order by ID;');
+console.log('UserID=658, ID>384493 共', r.length, '条:');
+for (const x of r)
+    console.log([x.ID, x.CreateTime, 'Day=' + x.DayNumber, 'Card=' + x.CardTask, 'Share=' + x.IsShare, 'HW=' + x.HardworkingNumber, 'Mil=' + x.MilestoneDayNumber, 'Aph=' + x.AphorismID].join(' | '));
+
+const g = await Miaoguo.RunSql([658],
+    'SELECT COUNT(*) as rows, COUNT(DISTINCT DATE(CreateTime)) as days, MAX(DayNumber) as maxDay, MIN(DayNumber) as minDay FROM MiaoguoTask where CardTask>0 and UserID=658;');
+console.log('\n汇总:', JSON.stringify(g[0]));
+
+const dup = await Miaoguo.RunSql([658],
+    "SELECT DATE(CreateTime) d, COUNT(*) c FROM MiaoguoTask WHERE CardTask>0 AND UserID=658 GROUP BY DATE(CreateTime) HAVING c>1 ORDER BY d DESC LIMIT 20;");
+console.log('同一天多条:', JSON.stringify(dup));
+process.exit(0);

scripts/fix_all_broken.mjs

@@ -0,0 +1,71 @@
+// 修复全库所有 DayNumber 异常用户：去重(每天保留最完整一条) + 按天连续重编号。
+import moment from 'moment';
+import Miaoguo from '../src/model/miaoguo.js';
+import constantClass from '../src/util/constant/index.js';
+import { stringUtils } from '../src/util/stringClass.js';
+
+const dayKey = (x) => moment(x.CreateTime).format('YYYY-MM-DD');
+const score = (x) => (x.IsShare > 0 ? 4 : 0) + (x.MilestoneDayNumber > 0 ? 2 : 0) + (x.AphorismID > 0 ? 1 : 0);
+
+async function fixUser(userID) {
+    const tasks = await Miaoguo.RunSql([userID],
+        "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime, ID desc;");
+    if (!tasks || tasks.length === 0) return `User ${userID}: 无记录`;
+
+    const dayBest = new Map();
+    for (const t of tasks) {
+        const key = dayKey(t);
+        const best = dayBest.get(key);
+        if (!best) dayBest.set(key, t);
+        else if (score(t) > score(best) || (score(t) === score(best) && t.ID > best.ID))
+            dayBest.set(key, t);
+    }
+
+    let deleted = 0;
+    for (const t of tasks) {
+        if (dayBest.get(dayKey(t)).ID !== t.ID) {
+            await Miaoguo.RunSql([t.ID], "delete from MiaoguoTask where ID=?;");
+            deleted++;
+        }
+    }
+
+    const dayTasks = [...dayBest.values()].sort((a, b) =>
+        a.CreateTime < b.CreateTime ? -1 : a.CreateTime > b.CreateTime ? 1 : a.ID - b.ID);
+
+    const milestone = constantClass.GetMilestone();
+    let milestoneIDs = [];
+    for (let i = 0; i < 40; i++) milestoneIDs.push(i + 1);
+    milestoneIDs = stringUtils.RandomArray(milestoneIDs);
+    let milestoneIndex = 0, hardworkingIndex = 0;
+    for (let i = 0; i < dayTasks.length; i++) {
+        const t = dayTasks[i];
+        const update = { ID: t.ID, DayNumber: i + 1 };
+        const milestoneItem = milestone.find(item => item.DayNumber == i + 1);
+        if (milestoneItem) {
+            update.MilestoneDayNumber = milestoneItem.DayNumber;
+            update.MilestoneID = milestoneIDs[milestoneIndex++];
+        }
+        if (t.IsShare > 0 || update.MilestoneDayNumber > 0 || t.AphorismID > 0)
+            update.HardworkingNumber = ++hardworkingIndex;
+        await Miaoguo.UpdateMiaoguoTask(update);
+    }
+    return `User ${userID}: 删除重复 ${deleted} 条，重编号 ${dayTasks.length} 天 (1..${dayTasks.length})`;
+}
+
+const rows = await Miaoguo.RunSql([], `
+    SELECT UserID,
+           COUNT(DISTINCT DATE(CreateTime)) as days,
+           MAX(DayNumber) as maxDay,
+           SUM(CASE WHEN DayNumber=0 THEN 1 ELSE 0 END) as zeroCnt
+    FROM MiaoguoTask
+    WHERE CardTask>0
+    GROUP BY UserID
+    HAVING zeroCnt>0 OR maxDay<>days
+    ORDER BY UserID;`);
+
+console.log('待修复用户数:', rows.length);
+for (const r of rows)
+    console.log(await fixUser(r.UserID));
+
+console.log('\n全部完成。');
+process.exit(0);

scripts/scan_2months.mjs

@@ -0,0 +1,52 @@
+import Miaoguo from '../src/model/miaoguo.js';
+
+const startDate = new Date(Date.now() - 60 * 86400000).toISOString().slice(0, 10);
+console.log('统计区间: >=', startDate);
+
+// 1) DayNumber 异常（全时段，限定近两个月有任务的用户）
+const bad = await Miaoguo.RunSql([startDate], `
+    SELECT UserID, COUNT(DISTINCT DATE(CreateTime)) days, MAX(DayNumber) maxDay,
+           SUM(CASE WHEN DayNumber=0 THEN 1 ELSE 0 END) zeroCnt
+    FROM MiaoguoTask
+    WHERE CardTask>0 AND UserID IN (SELECT DISTINCT UserID FROM MiaoguoTask WHERE CardTask>0 AND CreateTime>=?)
+    GROUP BY UserID
+    HAVING zeroCnt>0 OR maxDay<>days
+    ORDER BY UserID;`);
+console.log('\n[1] DayNumber 异常用户数:', bad.length);
+if (bad.length) console.log('    ', bad.map(r => `U${r.UserID}(z=${r.zeroCnt},max=${r.maxDay},days=${r.days})`).join(', '));
+
+// 2) 近两个月：有学习记录但没有 MiaoguoTask 记录的天（需要补齐）
+const missing = await Miaoguo.RunSql([startDate], `
+    SELECT mc.UserID, DATE_FORMAT(r.CreateTime,'%Y-%m-%d') d,
+           COUNT(DISTINCT r.CardID) CardCount, SUM(r.Duration) Duration
+    FROM MiaoguoLearningRecord r
+    INNER JOIN MiaoguoCard mc ON mc.MiaoguoCardID = r.CardID
+    LEFT JOIN MiaoguoTask t ON t.UserID = mc.UserID AND DATE(t.CreateTime) = DATE(r.CreateTime)
+    WHERE r.Flag=0 AND r.CreateTime >= ? AND t.ID IS NULL
+    GROUP BY mc.UserID, DATE_FORMAT(r.CreateTime,'%Y-%m-%d')
+    ORDER BY mc.UserID, d;`);
+const mUsers = [...new Set(missing.map(r => r.UserID))];
+console.log('\n[2] 缺 MiaoguoTask 记录: 受影响用户数:', mUsers.length, ' 缺失天数合计:', missing.length);
+console.log('    用户:', mUsers.join(','));
+if (missing.length) {
+    console.log('    明细(前30):');
+    for (const r of missing.slice(0, 30))
+        console.log(`      U${r.UserID} ${r.d} Card=${r.CardCount} Dur=${r.Duration}`);
+}
+
+// 3) 近两个月同一天多条 MiaoguoTask 记录
+const dup = await Miaoguo.RunSql([startDate], `
+    SELECT UserID, DATE_FORMAT(CreateTime,'%Y-%m-%d') d, COUNT(*) c
+    FROM MiaoguoTask
+    WHERE CardTask>0 AND CreateTime>=?
+    GROUP BY UserID, DATE_FORMAT(CreateTime,'%Y-%m-%d')
+    HAVING c>1
+    ORDER BY UserID, d;`);
+console.log('\n[3] 同一天多条记录: 天数:', dup.length);
+if (dup.length) {
+    const dUsers = [...new Set(dup.map(r => r.UserID))];
+    console.log('    用户:', dUsers.join(','));
+    console.log('    明细:', dup.map(r => `U${r.UserID}@${r.d}x${r.c}`).join(', '));
+}
+
+process.exit(0);

scripts/scan_all_broken.mjs

@@ -0,0 +1,25 @@
+import Miaoguo from '../src/model/miaoguo.js';
+
+// 找出所有 DayNumber 异常的用户：
+// 1) 存在 DayNumber=0 的行
+// 2) DayNumber 最大值 != 实际不同天数（历史膨胀）
+const rows = await Miaoguo.RunSql([], `
+    SELECT UserID,
+           COUNT(DISTINCT DATE(CreateTime)) as days,
+           MAX(DayNumber) as maxDay,
+           MIN(DayNumber) as minDay,
+           SUM(CASE WHEN DayNumber=0 THEN 1 ELSE 0 END) as zeroCnt
+    FROM MiaoguoTask
+    WHERE CardTask>0
+    GROUP BY UserID
+    HAVING zeroCnt>0 OR maxDay<>days
+    ORDER BY UserID;`);
+
+console.log('异常用户数:', rows.length);
+console.log('有 DayNumber=0 的用户数:', rows.filter(r => r.zeroCnt > 0).length);
+console.log('DayNumber 膨胀(maxDay<>days)的用户数:', rows.filter(r => r.maxDay !== r.days).length);
+console.log('用户列表:', rows.map(r => r.UserID).join(','));
+console.log('明细(前20):');
+for (const r of rows.slice(0, 20))
+    console.log(`  UserID=${r.UserID} days=${r.days} maxDay=${r.maxDay} zeroCnt=${r.zeroCnt}`);
+process.exit(0);

src/api/miaoguo/miaoguoController.js

@@ -1500,7 +1500,9 @@ export async function GetMiaoguoTaskTime(ctx) {
 
     delete param.CreateTime;
     const dayNumberArr = await miaoguo.GetTaskData(param);
-    let dayNumber = dayNumberArr.length;
+    // 按“不同日期数”统计累计练习天数，避免同一天多条记录把 DayNumber 撑大
+    const dayCount = new Set(dayNumberArr.map(item => item.taskDate)).size;
+    let dayNumber = dayCount;
     if (dayNumber == 0)
         dayNumber = 1;
 
@@ -1516,12 +1518,12 @@ export async function GetMiaoguoTaskTime(ctx) {
             };
             const tasks = await miaoguo.GetUserMiaoguoTask(param);
             if (tasks && tasks.length > 0) {
-                // 当天任务已存在，dayNumberArr 已包含当天记录，直接用累计练习天数
-                obj.DayNumber = dayNumberArr.length;
+                // 当天任务已存在，dayCount 已包含当天记录，直接用累计练习天数
+                obj.DayNumber = dayCount;
                 await miaoguo.UpdateMiaoguoTask(obj);
             } else {
-                // 新增当天任务，DayNumber 为已有累计天数 + 1（注意用原始长度，新用户首日应为 1）
-                obj.DayNumber = dayNumberArr.length + 1;
+                // 新增当天任务，DayNumber 为已有累计天数 + 1（新用户首日应为 1）
+                obj.DayNumber = dayCount + 1;
                 await miaoguo.AddMiaoguoTask(obj);
                 await updateMiaoguoMilestoneInfoByUserID(param.UserID);
             }
@@ -2084,10 +2086,18 @@ export async function GetShareItemInfo(ctx) {
             if (list[0].MilestoneDayNumber > 0)
                 isMilestone = 1;
 
+            // 用“截至该任务日期的不同练习天数”计算 DayNumber，
+            // 避免上一条记录 DayNumber=0 时被算成 1
+            const dayCountArr = await miaoguo.GetUserMiaoguoTaskDayCount({
+                UserID: param.UserID,
+                CreateTime: list[0].CreateTime,
+            });
+            const currentDayNumber = (dayCountArr && dayCountArr[0] && dayCountArr[0].DayNumber) || 1;
+
             if (list[1]) {
                 const param2 = {
                     ID: list[0].ID,
-                    DayNumber: list[1].DayNumber + 1,
+                    DayNumber: currentDayNumber,
                 };
                 if (list[1].HardworkingNumber > 0) {
                     param2.HardworkingNumber = list[1].HardworkingNumber + 1;
@@ -2105,7 +2115,7 @@ export async function GetShareItemInfo(ctx) {
             } else {
                 await miaoguo.UpdateMiaoguoTask({
                     ID: list[0].ID,
-                    DayNumber: 1,
+                    DayNumber: currentDayNumber,
                     HardworkingNumber: 1,
                 });
             }
@@ -3598,26 +3608,30 @@ export async function updateMiaoguoTaskData(ctx) {
         );
         const milestone = constantClass.GetMilestone();
         for (const user of taskUsers) {
+          try {
             const tasks = await miaoguo.RunSql([user.UserID], "SELECT * FROM MiaoguoTask where CardTask>0 and UserID=? order by CreateTime, ID desc;");
             if (!tasks || tasks.length == 0) continue;
 
             // 同一天可能有多条记录（历史并发写入导致）。每天只保留“最完整”的一条，
             // 优先 已分享(IsShare>0) / 有里程碑 / 有格言，其次保留最新 ID；其余重复行删除。
             // 这样 DayNumber 按“天”连续递增，且不会因删除重复行而丢失分享/里程碑/勤勉信息。
+            // 注意：CreateTime 是 Date 对象，不能直接当 Map key（对象引用不相等），必须转成日期字符串
+            const dayKey = (x) => moment(x.CreateTime).format('YYYY-MM-DD');
             const dayBest = new Map();
             for (const t of tasks) {
-                const best = dayBest.get(t.CreateTime);
+                const key = dayKey(t);
+                const best = dayBest.get(key);
                 if (!best) {
-                    dayBest.set(t.CreateTime, t);
+                    dayBest.set(key, t);
                 } else {
                     const score = (x) => (x.IsShare > 0 ? 4 : 0) + (x.MilestoneDayNumber > 0 ? 2 : 0) + (x.AphorismID > 0 ? 1 : 0);
                     if (score(t) > score(best) || (score(t) === score(best) && t.ID > best.ID))
-                        dayBest.set(t.CreateTime, t);
+                        dayBest.set(key, t);
                 }
             }
             // 删除同一天的多余记录（仅保留 dayBest 中的那一条）
             for (const t of tasks) {
-                if (dayBest.get(t.CreateTime).ID !== t.ID)
+                if (dayBest.get(dayKey(t)).ID !== t.ID)
                     await miaoguo.RunSql([t.ID], "delete from MiaoguoTask where ID=?;");
             }
             const dayTasks = [...dayBest.values()].sort((a, b) =>
@@ -3640,6 +3654,9 @@ export async function updateMiaoguoTaskData(ctx) {
                     update.HardworkingNumber = ++hardworkingIndex;
                 await miaoguo.UpdateMiaoguoTask(update);
             }
+          } catch (err) {
+            console.error('updateMiaoguoTaskData 处理用户失败 UserID=' + user.UserID + ':', err);
+          }
         }
     }
 

src/model/miaoguo.js

@@ -411,8 +411,15 @@ class Miaoguo {
     }
 
     static async AddMiaoguoTask(obj) {
-        const sql = "insert into MiaoguoTask (UserID,CreateTime,CardTask,Duration) select ?,?,?,? from dual where not exists (select UserID,CreateTime from MiaoguoTask where UserID=? and CreateTime=?) limit 1;";
-        return await query(sql, [obj.UserID, obj.CreateTime, obj.CardTask, obj.Duration, obj.UserID, obj.CreateTime]);
+        // 必须写入 DayNumber：否则新一天的任务记录会用列默认值 0
+        const sql = "insert into MiaoguoTask (UserID,CreateTime,CardTask,Duration,DayNumber) select ?,?,?,?,? from dual where not exists (select UserID,CreateTime from MiaoguoTask where UserID=? and CreateTime=?) limit 1;";
+        return await query(sql, [obj.UserID, obj.CreateTime, obj.CardTask, obj.Duration, obj.DayNumber || 0, obj.UserID, obj.CreateTime]);
+    }
+
+    // 截至某一天（含）的累计练习天数，用于计算 DayNumber
+    static async GetUserMiaoguoTaskDayCount(obj) {
+        const sql = "SELECT COUNT(DISTINCT DATE(CreateTime)) as DayNumber FROM MiaoguoTask WHERE CardTask>0 AND UserID=? AND CreateTime<=?;";
+        return await query(sql, [obj.UserID, obj.CreateTime]);
     }
 
     static async GetUserMiaoguoTask(obj) {