@kne/fastify-message 1.0.7 → 1.0.9

package/index.js

@@ -28,7 +28,8 @@ module.exports = fp(async function(fastify, options) {
   });
 
   fastify.register(fp(async (fastify, options) => {
-    await fastify.sequelize.syncPromise;
-    await fastify[options.name].services.includeTemplate(options.templateDir);
+    fastify.sequelize.syncPromise.then(() => {
+      return fastify[options.name].services.includeTemplate(options.templateDir);
+    });
   }), options);
 });

package/libs/controllers/main.js

@@ -164,10 +164,11 @@ module.exports = fp(async (fastify, options) => {
       schema: {
         description: '获取消息统计数据概览',
         summary: '统计数据概览',
-        querystring: {
+          querystring: {
           type: 'object',
           properties: {
-            range: { type: 'string', default: '7d', description: '时间范围: 7d=近7天, 1m=近1个月, 1y=近1年' }
+            range: { type: 'string', default: '7d', description: '时间范围: 7d=近7天, 1m=近1个月, 1y=近1年' },
+            timezone: { type: 'string', description: '时区，如 Asia/Shanghai，默认服务器时区' }
           }
         },
         response: {
@@ -232,8 +233,8 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      const { range = '7d' } = request.query;
-      return await services.statistics.getOverview({ range });
+      const { range = '7d', timezone } = request.query;
+      return await services.statistics.getOverview({ range, timezone });
     }
   );
 
@@ -246,22 +247,23 @@ module.exports = fp(async (fastify, options) => {
       schema: {
         description: 'SSE实时推送当天消息统计数据',
         summary: '实时统计数据SSE',
-        querystring: {
+          querystring: {
           type: 'object',
           properties: {
-            interval: { type: 'integer', minimum: 1, default: 5, description: '推送间隔时间（秒），最小1秒，默认5秒' }
+            interval: { type: 'integer', minimum: 1, default: 5, description: '推送间隔时间（秒），最小1秒，默认5秒' },
+            timezone: { type: 'string', description: '时区，如 Asia/Shanghai，默认服务器时区' }
           }
         }
       }
     },
     async function (request, reply) {
-      const intervalSeconds = request.query.interval;
-      reply.sse.keepAlive();
+      const intervalSeconds = request.query.interval ?? 5;
+      const { timezone } = request.query;
 
       async function* eventStream() {
         while (reply.sse.isConnected) {
           try {
-            yield { data: JSON.stringify(await services.statistics.getRealtime()) };
+            yield { data: JSON.stringify(await services.statistics.getRealtime({ timezone })) };
           } catch (err) {
             yield { event: 'error', data: JSON.stringify({ message: err.message }) };
           }

package/libs/services/main.js

@@ -5,8 +5,33 @@ const template = require('lodash/template');
 const merge = require('lodash/merge');
 const nodemailer = require('nodemailer');
 const { convert } = require('html-to-text');
+const dayjs = require('dayjs');
+const utc = require('dayjs/plugin/utc');
+const timezone = require('dayjs/plugin/timezone');
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
 
 module.exports = fp(async (fastify, options) => {
+  // 按指定时区获取"今天0点"的UTC Date对象
+  const getTodayStart = tz => {
+    if (!tz) {
+      return dayjs().startOf('day').toDate();
+    }
+    // 在目标时区下取今天0点，再转回UTC
+    return dayjs().tz(tz).startOf('day').toDate();
+  };
+
+  // 按指定时区格式化日期
+  const formatDate = (date, tz) => {
+    if (!tz) {
+      return dayjs(date).format('YYYY-MM-DD');
+    }
+    return dayjs(date).tz(tz).format('YYYY-MM-DD');
+  };
+
+  const resolveTimezone = tz => tz || dayjs.tz.guess();
+
   const emailConfig = Object.assign({}, {
     port: 465, secure: true
   }, options.emailConfig);
@@ -156,11 +181,13 @@ module.exports = fp(async (fastify, options) => {
     
     // 统计相关服务
     statistics: {
-      getOverview: async ({ range = '7d' } = {}) => {
+      getOverview: async ({ range = '7d', timezone } = {}) => {
         const { Sequelize } = models.record.sequelize;
         const recordModel = models.record;
         const templateModel = models.template;
         const createdAtCol = recordModel.rawAttributes.createdAt.field;
+        const dialect = recordModel.sequelize.getDialect();
+        const effectiveTimezone = resolveTimezone(timezone);
 
         // 根据range计算起始时间
         const rangeMap = {
@@ -170,11 +197,23 @@ module.exports = fp(async (fastify, options) => {
         };
         const normalizedRange = rangeMap[range] ? range : '7d';
         const rangeConfig = rangeMap[normalizedRange];
-        const startDate = new Date();
+        // 按时区计算起始日期：先获取目标时区"今天0点"的UTC时间，再往前推N天
+        const todayStart = getTodayStart(effectiveTimezone);
+        const startDate = new Date(todayStart);
         startDate.setDate(startDate.getDate() - rangeConfig.days);
 
         const whereRange = { createdAt: { [Sequelize.Op.gte]: startDate } };
-        const dateFn = col => Sequelize.fn('DATE', Sequelize.col(col));
+
+        // 按时区格式化日期的SQL：SQLite用strftime+utc偏移，MySQL用DATE_FORMAT+CONVERT_TZ，PostgreSQL用TO_CHAR+AT TIME ZONE
+        const dateFn = (() => {
+          if (!effectiveTimezone || dialect === 'sqlite') {
+            return col => Sequelize.fn('DATE', Sequelize.col(col));
+          }
+          if (dialect === 'postgres') {
+            return col => Sequelize.fn('TO_CHAR', Sequelize.literal(`"${col}" AT TIME ZONE '${effectiveTimezone}'`), 'YYYY-MM-DD');
+          }
+          return col => Sequelize.fn('DATE_FORMAT', Sequelize.fn('CONVERT_TZ', Sequelize.col(col), '+00:00', Sequelize.literal(`'${effectiveTimezone}'`)), '%Y-%m-%d');
+        })();
 
         // 并行执行所有查询
         const [totalRecords, byType, byCode, totalTemplates, templatesByStatus, templatesByType, recentTrend, recentTrendByType] = await Promise.all([
@@ -225,39 +264,84 @@ module.exports = fp(async (fastify, options) => {
           })
         ]);
 
+        // SQLite 需要在JS层做时区偏移修正DATE结果
+        const adjustDate = dateStr => {
+          if (!effectiveTimezone || dialect !== 'sqlite') return dateStr;
+          // SQLite DATE返回UTC日期，用dayjs转到目标时区取日期
+          return dayjs.utc(dateStr).tz(effectiveTimezone).format('YYYY-MM-DD');
+        };
+
         return {
           range: normalizedRange,
           rangeLabel: rangeConfig.label,
           totalRecords,
-          byType: byType.reduce((acc, item) => { acc[item.type] = Number(item.count); return acc; }, {}),
-          byCode: byCode.reduce((acc, item) => { acc[item.code] = Number(item.count); return acc; }, {}),
+          byType: byType.reduce((acc, item) => {
+            acc[String(item.type)] = Number(item.count);
+            return acc;
+          }, {}),
+          byCode: byCode.reduce((acc, item) => {
+            acc[item.code] = Number(item.count);
+            return acc;
+          }, {}),
           templateStats: {
             total: totalTemplates,
-            byStatus: templatesByStatus.reduce((acc, item) => { acc[item.status] = Number(item.count); return acc; }, {}),
-            byType: templatesByType.reduce((acc, item) => { acc[item.type] = Number(item.count); return acc; }, {})
+            byStatus: templatesByStatus.reduce((acc, item) => {
+              acc[String(item.status)] = Number(item.count);
+              return acc;
+            }, {}),
+            byType: templatesByType.reduce((acc, item) => {
+              acc[String(item.type)] = Number(item.count);
+              return acc;
+            }, {})
           },
-          recentTrend: recentTrend.map(item => ({ date: item.date, count: Number(item.count) })),
-          recentTrendByType: recentTrendByType.map(item => ({ date: item.date, type: item.type, count: Number(item.count) }))
+          recentTrend: recentTrend.map(item => ({ date: adjustDate(item.date), count: Number(item.count) })),
+          recentTrendByType: recentTrendByType.map(item => ({ date: adjustDate(item.date), type: item.type, count: Number(item.count) }))
         };
       },
 
-      getRealtime: async () => {
+      getRealtime: async ({ timezone } = {}) => {
         const { Sequelize } = models.record.sequelize;
         const recordModel = models.record;
         const createdAtCol = recordModel.rawAttributes.createdAt.field;
         const dialect = recordModel.sequelize.getDialect();
+        const effectiveTimezone = resolveTimezone(timezone);
 
-        // 当天起始时间
-        const todayStart = new Date();
-        todayStart.setHours(0, 0, 0, 0);
+        // 当天起始时间（按指定时区）
+        const todayStart = getTodayStart(effectiveTimezone);
 
         const whereToday = { createdAt: { [Sequelize.Op.gte]: todayStart } };
-        const hourExtract = dialect === 'sqlite'
-          ? Sequelize.fn('strftime', '%H', Sequelize.col(createdAtCol))
-          : Sequelize.fn('EXTRACT', Sequelize.literal(`HOUR FROM "${createdAtCol}"`));
 
-        // 并行执行所有查询
-        const [totalRecords, byType, byCode, hourlyTrend, hourlyTrendByType] = await Promise.all([
+        // SQLite: strftime取UTC时间后JS层偏移；MySQL: CONVERT_TZ转时区后提取；PostgreSQL: AT TIME ZONE转时区后提取
+        const hourExtract = (() => {
+          if (!effectiveTimezone || dialect === 'sqlite') {
+            return dialect === 'sqlite'
+              ? Sequelize.fn('strftime', '%H', Sequelize.col(createdAtCol))
+              : Sequelize.fn('EXTRACT', Sequelize.literal(`HOUR FROM "${createdAtCol}"`));
+          }
+          if (dialect === 'postgres') {
+            return Sequelize.fn('EXTRACT', Sequelize.literal(`HOUR FROM "${createdAtCol}" AT TIME ZONE '${effectiveTimezone}'`));
+          }
+          return Sequelize.fn('EXTRACT', Sequelize.literal(`HOUR FROM CONVERT_TZ("${createdAtCol}", '+00:00', '${effectiveTimezone}')`));
+        })();
+
+        // 15分钟间隔提取：SQLite用strftime，MySQL用DATE_FORMAT+EXTRACT，PostgreSQL用TO_CHAR+EXTRACT
+        const intervalExtract = (() => {
+          if (dialect === 'sqlite') {
+            return Sequelize.literal(`strftime('%H', "${createdAtCol}") || ':' || printf('%02d', CAST(strftime('%M', "${createdAtCol}") AS INTEGER) / 15 * 15)`);
+          }
+          if (!effectiveTimezone) {
+            if (dialect === 'postgres') {
+              return Sequelize.literal(`TO_CHAR("${createdAtCol}", 'HH24:') || LPAD((FLOOR(EXTRACT(MINUTE FROM "${createdAtCol}") / 15) * 15)::TEXT, 2, '0')`);
+            }
+            return Sequelize.literal(`CONCAT(DATE_FORMAT("${createdAtCol}", '%H:'), LPAD(FLOOR(EXTRACT(MINUTE FROM "${createdAtCol}") / 15) * 15, 2, '0'))`);
+          }
+          if (dialect === 'postgres') {
+            return Sequelize.literal(`TO_CHAR("${createdAtCol}" AT TIME ZONE '${effectiveTimezone}', 'HH24:') || LPAD((FLOOR(EXTRACT(MINUTE FROM "${createdAtCol}" AT TIME ZONE '${effectiveTimezone}') / 15) * 15)::TEXT, 2, '0')`);
+          }
+          return Sequelize.literal(`CONCAT(DATE_FORMAT(CONVERT_TZ("${createdAtCol}", '+00:00', '${effectiveTimezone}'), '%H:'), LPAD(FLOOR(EXTRACT(MINUTE FROM CONVERT_TZ("${createdAtCol}", '+00:00', '${effectiveTimezone}')) / 15) * 15, 2, '0'))`);
+        })();
+
+        const [totalRecords, byType, byCode, hourlyTrend, hourlyTrendByType, intervalTrend] = await Promise.all([
           recordModel.count({ where: whereToday }),
           recordModel.findAll({
             attributes: ['type', [Sequelize.fn('COUNT', Sequelize.col('id')), 'count']],
@@ -291,23 +375,53 @@ module.exports = fp(async (fastify, options) => {
             group: [hourExtract, 'type'],
             order: [[hourExtract, 'ASC'], ['type', 'ASC']],
             raw: true
+          }),
+          recordModel.findAll({
+            attributes: [
+              [intervalExtract, 'interval'],
+              [Sequelize.fn('COUNT', Sequelize.col('id')), 'count']
+            ],
+            where: whereToday,
+            group: [intervalExtract],
+            order: [[intervalExtract, 'ASC']],
+            raw: true
           })
         ]);
 
-        const formatDate = date => {
-          const y = date.getFullYear();
-          const m = String(date.getMonth() + 1).padStart(2, '0');
-          const d = String(date.getDate()).padStart(2, '0');
-          return `${y}-${m}-${d}`;
+        // SQLite的hour/interval是UTC，需按timezone偏移修正
+        const adjustHour = hour => {
+          if (!effectiveTimezone || dialect !== 'sqlite') return Number(hour);
+          // 构建一个UTC时间点（今天+hour:00），转目标时区后取hour
+          const utcTime = dayjs.utc().startOf('day').hour(Number(hour));
+          return utcTime.tz(effectiveTimezone).hour();
+        };
+
+        const adjustInterval = intervalStr => {
+          if (!effectiveTimezone || dialect !== 'sqlite') return intervalStr;
+          const [h, m] = intervalStr.split(':').map(Number);
+          // 构建一个UTC时间点（今天+hour:minute），转目标时区后格式化
+          const utcTime = dayjs.utc().startOf('day').hour(h).minute(m);
+          return utcTime.tz(effectiveTimezone).format('HH:mm');
         };
 
         return {
-          date: formatDate(todayStart),
+          date: formatDate(todayStart, effectiveTimezone),
           totalRecords,
-          byType: byType.reduce((acc, item) => { acc[item.type] = Number(item.count); return acc; }, {}),
-          byCode: byCode.reduce((acc, item) => { acc[item.code] = Number(item.count); return acc; }, {}),
-          hourlyTrend: hourlyTrend.map(item => ({ hour: Number(item.hour), count: Number(item.count) })),
-          hourlyTrendByType: hourlyTrendByType.map(item => ({ hour: Number(item.hour), type: item.type, count: Number(item.count) }))
+          byType: byType.reduce((acc, item) => {
+            acc[String(item.type)] = Number(item.count);
+            return acc;
+          }, {}),
+          byCode: byCode.reduce((acc, item) => {
+            acc[item.code] = Number(item.count);
+            return acc;
+          }, {}),
+          hourlyTrend: hourlyTrend.map(item => ({ hour: adjustHour(item.hour), count: Number(item.count) })),
+          hourlyTrendByType: hourlyTrendByType.map(item => ({
+            hour: adjustHour(item.hour),
+            type: Number(item.type),
+            count: Number(item.count)
+          })),
+          intervalTrend: intervalTrend.map(item => ({ interval: adjustInterval(item.interval), count: Number(item.count) }))
         };
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-message",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "管理消息发送，支持sms消息，email消息等.",
   "main": "index.js",
   "scripts": {
@@ -60,6 +60,7 @@
   },
   "dependencies": {
     "@fastify/sse": "^0.4.0",
+    "dayjs": "^1.11.20",
     "fs-extra": "^11.3.0",
     "html-to-text": "^9.0.5",
     "lodash": "^4.17.21",