@kne/fastify-task 2.0.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -925,7 +925,7 @@ module.exports = fp(async (fastify, options) => {
925
925
  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'))`);
926
926
  })();
927
927
 
928
- const [totalTasks, byStatus, byType, byRunnerType, hourlyTrend, hourlyTrendByStatus, hourlyTrendByType, intervalTrend] = await Promise.all([
928
+ const [totalTasks, byStatus, byType, byRunnerType, pendingByRunnerType, nonPendingByRunnerType, hourlyTrend, hourlyTrendByStatus, hourlyTrendByType, intervalTrend] = await Promise.all([
929
929
  taskModel.count({ where: whereToday }),
930
930
  taskModel.findAll({
931
931
  attributes: ['status', [Sequelize.fn('COUNT', Sequelize.col('id')), 'count']],
@@ -945,6 +945,18 @@ module.exports = fp(async (fastify, options) => {
945
945
  group: ['runnerType'],
946
946
  raw: true
947
947
  }),
948
+ taskModel.findAll({
949
+ attributes: ['runnerType', [Sequelize.fn('COUNT', Sequelize.col('id')), 'count']],
950
+ where: { ...whereToday, status: 'pending' },
951
+ group: ['runnerType'],
952
+ raw: true
953
+ }),
954
+ taskModel.findAll({
955
+ attributes: ['runnerType', [Sequelize.fn('COUNT', Sequelize.col('id')), 'count']],
956
+ where: { ...whereToday, status: { [Sequelize.Op.ne]: 'pending' } },
957
+ group: ['runnerType'],
958
+ raw: true
959
+ }),
948
960
  taskModel.findAll({
949
961
  attributes: [
950
962
  [hourExtract, 'hour'],
@@ -1003,6 +1015,32 @@ module.exports = fp(async (fastify, options) => {
1003
1015
  return utcTime.tz(effectiveTimezone).format('HH:mm');
1004
1016
  };
1005
1017
 
1018
+ const byRunnerTypeMap = byRunnerType.reduce((acc, item) => {
1019
+ acc[item.runnerType] = Number(item.count);
1020
+ return acc;
1021
+ }, {});
1022
+ const pendingByRunnerTypeMap = pendingByRunnerType.reduce((acc, item) => {
1023
+ acc[item.runnerType] = Number(item.count);
1024
+ return acc;
1025
+ }, {});
1026
+ const nonPendingByRunnerTypeMap = nonPendingByRunnerType.reduce((acc, item) => {
1027
+ acc[item.runnerType] = Number(item.count);
1028
+ return acc;
1029
+ }, {});
1030
+ const runnerTypeStatsKeys = new Set([
1031
+ ...Object.keys(byRunnerTypeMap),
1032
+ ...Object.keys(pendingByRunnerTypeMap),
1033
+ ...Object.keys(nonPendingByRunnerTypeMap)
1034
+ ]);
1035
+ const runnerTypeStats = {};
1036
+ for (const k of runnerTypeStatsKeys) {
1037
+ runnerTypeStats[k] = {
1038
+ total: Number(byRunnerTypeMap[k]) || 0,
1039
+ pending: Number(pendingByRunnerTypeMap[k]) || 0,
1040
+ executed: Number(nonPendingByRunnerTypeMap[k]) || 0
1041
+ };
1042
+ }
1043
+
1006
1044
  return {
1007
1045
  date: formatDate(todayStart, effectiveTimezone),
1008
1046
  totalTasks,
@@ -1014,10 +1052,9 @@ module.exports = fp(async (fastify, options) => {
1014
1052
  acc[item.type] = Number(item.count);
1015
1053
  return acc;
1016
1054
  }, {}),
1017
- byRunnerType: byRunnerType.reduce((acc, item) => {
1018
- acc[item.runnerType] = Number(item.count);
1019
- return acc;
1020
- }, {}),
1055
+ byRunnerType: byRunnerTypeMap,
1056
+ pendingByRunnerType: pendingByRunnerTypeMap,
1057
+ runnerTypeStats,
1021
1058
  hourlyTrend: hourlyTrend.map(item => ({ hour: adjustHour(item.hour), count: Number(item.count) })),
1022
1059
  hourlyTrendByStatus: hourlyTrendByStatus.map(item => ({
1023
1060
  hour: adjustHour(item.hour),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kne/fastify-task",
3
- "version": "2.0.1",
3
+ "version": "2.0.2",
4
4
  "description": "一个 Fastify 插件,用于任务编排、追踪任务执行状态和结果。支持系统自动执行和手动执行两种模式,提供完整的任务生命周期管理",
5
5
  "main": "index.js",
6
6
  "scripts": {