@hecom/codearts 0.2.1 → 0.2.2

package/dist/commands/work-hour.command.js

@@ -4,150 +4,208 @@ exports.workHourCommand = workHourCommand;
 const holidays_1 = require("../config/holidays");
 const business_service_1 = require("../services/business.service");
 const config_loader_1 = require("../utils/config-loader");
+const csv_writer_1 = require("../utils/csv-writer");
+const logger_1 = require("../utils/logger");
 /**
- * work-hour 命令入口
+ * 处理浮点数精度，保留2位小数
  */
-async function workHourCommand(year, cliOptions = {}) {
-    try {
-        const targetYear = year || new Date().getFullYear().toString();
-        console.log(`开始获取 ${targetYear} 年工时统计...`);
-        const { projectId, roleIds, config } = (0, config_loader_1.loadConfig)(cliOptions);
-        const businessService = new business_service_1.BusinessService(config);
-        // 收集所有角色的成员和工时数据
-        const allMembers = [];
-        const allUserStats = [];
-        const allTypes = new Set();
-        for (const roleId of roleIds) {
-            const roleMembers = await businessService.getMembersByRoleId(projectId, roleId);
-            if (roleMembers.length === 0) {
-                console.log(`角色ID ${roleId} 未找到用户，跳过`);
-                continue;
-            }
-            const roleName = roleMembers[0].role_name;
-            allMembers.push(...roleMembers);
-            const roleUserIds = roleMembers.map((member) => member.user_id);
-            const stats = await businessService.getAllWorkHourStats(projectId, roleUserIds, `${targetYear}-01-01`, `${targetYear}-12-31`);
-            // 为每个用户添加角色信息
-            stats.userStats.forEach((userStat) => {
-                allUserStats.push({
-                    ...userStat,
-                    roleName,
-                    roleId,
-                });
-                // 收集所有领域类型
-                userStat.domainStats.forEach((domainStat) => {
-                    allTypes.add(domainStat.type);
-                });
+function roundToTwo(num) {
+    return Math.round(num * 100) / 100;
+}
+/**
+ * 查询年度工时数据
+ */
+async function queryWorkHourReportData(businessService, projectId, roleIds, targetYear) {
+    const allMembers = [];
+    const allUserStats = [];
+    const allTypes = new Set();
+    for (const roleId of roleIds) {
+        const roleMembers = await businessService.getMembersByRoleId(projectId, roleId);
+        if (roleMembers.length === 0) {
+            logger_1.logger.warn(`角色ID ${roleId} 未找到用户，跳过`);
+            continue;
+        }
+        const roleName = roleMembers[0].role_name;
+        allMembers.push(...roleMembers);
+        const roleUserIds = roleMembers.map((member) => member.user_id);
+        const stats = await businessService.getAllWorkHourStats(projectId, roleUserIds, `${targetYear}-01-01`, `${targetYear}-12-31`);
+        stats.userStats.forEach((userStat) => {
+            allUserStats.push({
+                ...userStat,
+                roleName,
+                roleId,
+            });
+            userStat.domainStats.forEach((domainStat) => {
+                allTypes.add(domainStat.type);
             });
+        });
+    }
+    allUserStats.sort((a, b) => {
+        if (a.roleId !== b.roleId) {
+            return a.roleId - b.roleId;
         }
-        if (allMembers.length === 0) {
-            console.log('未找到任何角色的用户');
-            return;
+        return a.userName.localeCompare(b.userName);
+    });
+    const expectedWorkdays = (0, holidays_1.calculateExpectedWorkdays)(targetYear);
+    const expectedHoursPerPerson = expectedWorkdays * 8;
+    const totalExpectedHours = expectedHoursPerPerson * allMembers.length;
+    const totalHours = roundToTwo(allUserStats.reduce((sum, userStat) => sum + userStat.totalHours, 0));
+    const totalEntries = allUserStats.reduce((sum, userStat) => sum + userStat.domainStats.reduce((s, d) => s + d.workHours.length, 0), 0);
+    const userStatsData = [];
+    const roleSubtotals = [];
+    const typeTotals = {};
+    allTypes.forEach((type) => {
+        typeTotals[type] = 0;
+    });
+    let currentRoleId = null;
+    let currentRoleName = '';
+    const roleSubtotalStats = {};
+    allUserStats.forEach((userStat, index) => {
+        if (currentRoleId !== null && currentRoleId !== userStat.roleId) {
+            const subtotalDomainStats = {};
+            let subtotal = 0;
+            allTypes.forEach((type) => {
+                subtotalDomainStats[type] = roleSubtotalStats[type] || 0;
+                subtotal = roundToTwo(subtotal + (roleSubtotalStats[type] || 0));
+            });
+            roleSubtotals.push({
+                roleName: currentRoleName,
+                domainStats: subtotalDomainStats,
+                total: subtotal,
+            });
+            Object.keys(roleSubtotalStats).forEach((key) => {
+                roleSubtotalStats[key] = 0;
+            });
         }
-        // 按角色ID排序用户
-        allUserStats.sort((a, b) => {
-            if (a.roleId !== b.roleId) {
-                return a.roleId - b.roleId;
-            }
-            return a.userName.localeCompare(b.userName);
-        });
-        const expectedWorkdays = (0, holidays_1.calculateExpectedWorkdays)(targetYear);
-        const expectedHoursPerPerson = expectedWorkdays * 8;
-        const totalExpectedHours = expectedHoursPerPerson * allMembers.length;
-        // 计算总工时
-        const totalHours = allUserStats.reduce((sum, userStat) => sum + userStat.totalHours, 0);
-        const totalEntries = allUserStats.reduce((sum, userStat) => sum + userStat.domainStats.reduce((s, d) => s + d.workHours.length, 0), 0);
-        console.log(`\n${targetYear}年工时统计报告`);
-        console.log('='.repeat(80));
-        console.log(`统计期间: ${targetYear}-01-01 至 ${targetYear}-12-31`);
-        console.log(`统计角色: ${roleIds.length} 个角色`);
-        console.log(`统计人数: ${allMembers.length} 人`);
-        console.log(`应计工作日: ${expectedWorkdays} 天`);
-        console.log(`应计工时: ${totalExpectedHours} 小时 (${expectedHoursPerPerson} 小时/人)`);
-        console.log(`实际工时: ${totalHours} 小时`);
-        console.log(`工时完成率: ${((totalHours / totalExpectedHours) * 100).toFixed(2)}%`);
-        console.log(`工时条目: ${totalEntries} 条`);
-        console.log('='.repeat(80));
-        // 构建表格数据：人作为行，type作为列
-        const tableData = {};
-        const typeTotals = {};
-        // 初始化总计
+        currentRoleId = userStat.roleId;
+        currentRoleName = userStat.roleName;
+        const domainStats = {};
         allTypes.forEach((type) => {
-            typeTotals[type] = 0;
+            domainStats[type] = 0;
         });
-        // 按角色分组并填充数据
-        let currentRoleId = null;
-        let currentRoleName = '';
-        const roleSubtotals = {};
-        allUserStats.forEach((userStat, index) => {
-            // 检测角色变化，插入小计行
-            if (currentRoleId !== null && currentRoleId !== userStat.roleId) {
-                const subtotalRow = {};
-                subtotalRow['角色'] = `${currentRoleName} 小计`;
-                let subtotal = 0;
-                allTypes.forEach((type) => {
-                    subtotalRow[type] = roleSubtotals[type] || 0;
-                    subtotal += roleSubtotals[type] || 0;
-                });
-                subtotalRow['合计'] = subtotal;
-                tableData[`─ ${currentRoleName} 小计`] = subtotalRow;
-                // 重置小计
-                Object.keys(roleSubtotals).forEach((key) => {
-                    roleSubtotals[key] = 0;
-                });
+        let userTotal = 0;
+        userStat.domainStats.forEach((domainStat) => {
+            domainStats[domainStat.type] = domainStat.totalHours;
+            userTotal = roundToTwo(userTotal + domainStat.totalHours);
+            typeTotals[domainStat.type] = roundToTwo(typeTotals[domainStat.type] + domainStat.totalHours);
+            if (!roleSubtotalStats[domainStat.type]) {
+                roleSubtotalStats[domainStat.type] = 0;
             }
-            // 更新当前角色
-            currentRoleId = userStat.roleId;
-            currentRoleName = userStat.roleName;
-            // 填充用户数据
-            const row = {};
-            row['角色'] = userStat.roleName;
-            // 初始化所有类型为0
+            roleSubtotalStats[domainStat.type] = roundToTwo(roleSubtotalStats[domainStat.type] + domainStat.totalHours);
+        });
+        userStatsData.push({
+            userName: userStat.userName,
+            roleName: userStat.roleName,
+            roleId: userStat.roleId,
+            domainStats,
+            total: userTotal,
+        });
+        if (index === allUserStats.length - 1) {
+            const subtotalDomainStats = {};
+            let subtotal = 0;
             allTypes.forEach((type) => {
-                row[type] = 0;
+                subtotalDomainStats[type] = roleSubtotalStats[type] || 0;
+                subtotal = roundToTwo(subtotal + (roleSubtotalStats[type] || 0));
             });
-            // 填充实际工时
-            let userTotal = 0;
-            userStat.domainStats.forEach((domainStat) => {
-                row[domainStat.type] = domainStat.totalHours;
-                userTotal += domainStat.totalHours;
-                typeTotals[domainStat.type] += domainStat.totalHours;
-                // 累加到角色小计
-                if (!roleSubtotals[domainStat.type]) {
-                    roleSubtotals[domainStat.type] = 0;
-                }
-                roleSubtotals[domainStat.type] += domainStat.totalHours;
+            roleSubtotals.push({
+                roleName: currentRoleName,
+                domainStats: subtotalDomainStats,
+                total: subtotal,
             });
-            row['合计'] = userTotal;
-            tableData[userStat.userName] = row;
-            // 如果是最后一个用户，添加最后一个角色的小计
-            if (index === allUserStats.length - 1) {
-                const subtotalRow = {};
-                subtotalRow['角色'] = `${currentRoleName} 小计`;
-                let subtotal = 0;
-                allTypes.forEach((type) => {
-                    subtotalRow[type] = roleSubtotals[type] || 0;
-                    subtotal += roleSubtotals[type] || 0;
-                });
-                subtotalRow['合计'] = subtotal;
-                tableData[`─ ${currentRoleName} 小计`] = subtotalRow;
-            }
-        });
-        // 添加总计行
-        const totalRow = {};
-        totalRow['角色'] = '━ 总计';
-        let grandTotal = 0;
-        allTypes.forEach((type) => {
-            totalRow[type] = typeTotals[type];
-            grandTotal += typeTotals[type];
-        });
-        totalRow['合计'] = grandTotal;
-        tableData['━━ 总计'] = totalRow;
-        console.log('\n工时统计表:');
-        console.table(tableData);
+        }
+    });
+    const grandTotalDomainStats = {};
+    let grandTotal = 0;
+    allTypes.forEach((type) => {
+        grandTotalDomainStats[type] = typeTotals[type];
+        grandTotal = roundToTwo(grandTotal + typeTotals[type]);
+    });
+    return {
+        year: targetYear,
+        roleCount: roleIds.length,
+        memberCount: allMembers.length,
+        expectedWorkdays,
+        expectedHours: totalExpectedHours,
+        actualHours: totalHours,
+        completionRate: (totalHours / totalExpectedHours) * 100,
+        entryCount: totalEntries,
+        userStats: userStatsData,
+        roleSubtotals,
+        grandTotal: {
+            domainStats: grandTotalDomainStats,
+            total: grandTotal,
+        },
+    };
+}
+/**
+ * 控制台输出工时统计
+ */
+function outputConsole(data) {
+    logger_1.logger.info(`\n${data.year}年工时统计 [${data.roleSubtotals.map((r) => r.roleName).join(', ')}]`);
+    logger_1.logger.info('='.repeat(80));
+    logger_1.logger.info(`统计人数: ${data.memberCount} 人`);
+    logger_1.logger.info(`应计工作日: ${data.expectedWorkdays} 天`);
+    logger_1.logger.info(`应计工时: ${data.expectedHours} 小时`);
+    logger_1.logger.info(`实际工时: ${data.actualHours} 小时`);
+    logger_1.logger.info(`工时完成率: ${data.completionRate.toFixed(2)}%`);
+    logger_1.logger.info('='.repeat(80));
+    // 构建表格数据
+    const tableData = {};
+    data.userStats.forEach((userStat) => {
+        const row = {
+            ...userStat.domainStats,
+            合计: userStat.total,
+        };
+        tableData[userStat.userName] = row;
+    });
+    // 添加总计行
+    tableData['总计'] = {
+        ...data.grandTotal.domainStats,
+        合计: data.grandTotal.total,
+    };
+    logger_1.logger.table(tableData);
+}
+/**
+ * CSV 文件输出
+ */
+function outputCsv(data, targetYear) {
+    const domains = Object.keys(data.grandTotal.domainStats);
+    const csvLines = [];
+    csvLines.push(`用户,角色,${domains.join(',')},合计`);
+    data.userStats.forEach((userStat) => {
+        const domainValues = domains.map((domain) => userStat.domainStats[domain] || 0);
+        csvLines.push(`${userStat.userName},${userStat.roleName},${domainValues.join(',')},${userStat.total}`);
+    });
+    const filename = `work-hour-${targetYear}.csv`;
+    (0, csv_writer_1.writeCsvFile)(filename, csvLines, logger_1.logger);
+}
+/**
+ * JSON 输出（直接打印到控制台，供编程调用）
+ */
+function outputJson(data) {
+    logger_1.logger.json(data);
+}
+/**
+ * work-hour 命令入口
+ */
+async function workHourCommand(year, cliOptions = {}) {
+    try {
+        const targetYear = year || new Date().getFullYear().toString();
+        const { projectId, roleIds, config, outputFormat } = (0, config_loader_1.loadConfig)(cliOptions);
+        const businessService = new business_service_1.BusinessService(config);
+        const reportData = await queryWorkHourReportData(businessService, projectId, roleIds, targetYear);
+        if (outputFormat === 'console') {
+            outputConsole(reportData);
+        }
+        else if (outputFormat === 'csv') {
+            outputCsv(reportData, targetYear);
+        }
+        else if (outputFormat === 'json') {
+            outputJson(reportData);
+        }
     }
     catch (error) {
-        console.error('执行过程中发生错误:', error);
+        logger_1.logger.error(`执行过程中发生错误:`, error);
         process.exit(1);
     }
 }

package/dist/types/index.d.ts

@@ -564,3 +564,7 @@ export type ConfigMap = {
  * 部分配置映射（用于读取配置文件）
  */
 export type PartialConfigMap = Partial<ConfigMap>;
+/**
+ * 输出格式类型
+ */
+export type OutputFormat = 'console' | 'csv' | 'json';

package/dist/utils/config-loader.d.ts

@@ -1,32 +1,35 @@
-import { HuaweiCloudConfig, PartialConfigMap } from '../types';
+import { HuaweiCloudConfig, OutputFormat, PartialConfigMap } from '../types';
 /**
  * 获取全局配置文件路径
  */
-export declare function getGlobalConfigPath(): string;
+export declare function getConfigPath(): string;
 /**
  * 检查全局配置文件是否存在
  */
-export declare function globalConfigExists(): boolean;
+export declare function configExists(): boolean;
 /**
  * 读取全局配置
  */
-export declare function readGlobalConfig(): PartialConfigMap;
+export declare function readConfig(): PartialConfigMap;
 /**
  * 写入全局配置
  * 支持动态配置项，自动按分组组织配置文件
  */
-export declare function writeGlobalConfig(config: PartialConfigMap): void;
+export declare function writeConfig(config: PartialConfigMap): void;
 /**
  * 删除全局配置
  */
-export declare function deleteGlobalConfig(): void;
+export declare function deleteConfig(): void;
 export interface CliOptions {
     roleId?: string;
+    output?: string;
+    report?: boolean;
 }
 export interface LoadedConfig {
     projectId: string;
     roleIds: number[];
     config: HuaweiCloudConfig;
+    outputFormat: OutputFormat;
 }
 /**
  * 加载配置，优先级：命令行参数 > 全局配置

package/dist/utils/config-loader.js

@@ -33,11 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalConfigPath = getGlobalConfigPath;
-exports.globalConfigExists = globalConfigExists;
-exports.readGlobalConfig = readGlobalConfig;
-exports.writeGlobalConfig = writeGlobalConfig;
-exports.deleteGlobalConfig = deleteGlobalConfig;
+exports.getConfigPath = getConfigPath;
+exports.configExists = configExists;
+exports.readConfig = readConfig;
+exports.writeConfig = writeConfig;
+exports.deleteConfig = deleteConfig;
 exports.loadConfig = loadConfig;
 exports.getConfig = getConfig;
 const fs = __importStar(require("fs"));
@@ -61,20 +61,20 @@ function ensureConfigDir() {
 /**
  * 获取全局配置文件路径
  */
-function getGlobalConfigPath() {
+function getConfigPath() {
     return CONFIG_FILE;
 }
 /**
  * 检查全局配置文件是否存在
  */
-function globalConfigExists() {
+function configExists() {
     return fs.existsSync(CONFIG_FILE);
 }
 /**
  * 读取全局配置
  */
-function readGlobalConfig() {
-    if (!globalConfigExists()) {
+function readConfig() {
+    if (!configExists()) {
         return {};
     }
     const config = {};
@@ -127,7 +127,7 @@ const CONFIG_GROUPS = [
  * 写入全局配置
  * 支持动态配置项，自动按分组组织配置文件
  */
-function writeGlobalConfig(config) {
+function writeConfig(config) {
     ensureConfigDir();
     // 构建配置文件头部
     let content = `# Hecom CodeArts 全局配置文件`;
@@ -161,8 +161,8 @@ function writeGlobalConfig(config) {
 /**
  * 删除全局配置
  */
-function deleteGlobalConfig() {
-    if (globalConfigExists()) {
+function deleteConfig() {
+    if (configExists()) {
         try {
             fs.unlinkSync(CONFIG_FILE);
         }
@@ -172,7 +172,7 @@ function deleteGlobalConfig() {
     }
 }
 // 加载全局配置
-const globalConfig = globalConfigExists() ? readGlobalConfig() : {};
+const globalConfig = configExists() ? readConfig() : {};
 /**
  * 加载配置，优先级：命令行参数 > 全局配置
  * @param cliOptions 命令行选项
@@ -201,6 +201,11 @@ function loadConfig(cliOptions = {}) {
     if (!username || !password || !domain || !iamEndpoint || !region || !endpoint) {
         throw new Error('缺少华为云认证信息，请先运行 `npx @hecom/codearts config` 创建配置');
     }
+    // 处理输出格式
+    const outputFormat = (cliOptions.output || 'console');
+    if (!['console', 'csv', 'json'].includes(outputFormat)) {
+        throw new Error('输出格式必须是 console、csv 或 json 之一');
+    }
     const config = {
         iamEndpoint,
         region,
@@ -209,7 +214,7 @@ function loadConfig(cliOptions = {}) {
         password,
         domainName: domain,
     };
-    return { projectId, roleIds, config };
+    return { projectId, roleIds, config, outputFormat };
 }
 /**
  * 获取最终合并后的配置（用于显示）

package/dist/utils/csv-writer.d.ts

@@ -0,0 +1,12 @@
+import { Logger } from './logger';
+/**
+ * CSV 转义函数：处理双引号
+ */
+export declare function escapeCsv(value: string): string;
+/**
+ * 写入 CSV 文件到当前工作目录
+ * @param filename 文件名
+ * @param lines CSV 行数组
+ * @param logger 日志记录器（可选）
+ */
+export declare function writeCsvFile(filename: string, lines: string[], logger?: Logger): void;

package/dist/utils/csv-writer.js

@@ -0,0 +1,60 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.escapeCsv = escapeCsv;
+exports.writeCsvFile = writeCsvFile;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+/**
+ * CSV 转义函数：处理双引号
+ */
+function escapeCsv(value) {
+    if (!value)
+        return '';
+    return value.replace(/"/g, '""');
+}
+/**
+ * 写入 CSV 文件到当前工作目录
+ * @param filename 文件名
+ * @param lines CSV 行数组
+ * @param logger 日志记录器（可选）
+ */
+function writeCsvFile(filename, lines, logger) {
+    const filepath = path.join(process.cwd(), filename);
+    fs.writeFileSync(filepath, lines.join('\n'), 'utf-8');
+    if (logger) {
+        logger.success(`CSV 文件已生成: ${filepath}`);
+    }
+}

package/dist/utils/logger.d.ts

@@ -0,0 +1,62 @@
+export type OutputFormat = 'console' | 'csv' | 'json';
+/**
+ * 日志工具类（单例模式）
+ * 根据输出格式自动控制日志输出：
+ * - console/csv: 正常输出所有日志
+ * - json: 静默所有用户日志，只输出纯 JSON
+ */
+export declare class Logger {
+    private static instance;
+    private silent;
+    private constructor();
+    /**
+     * 获取 Logger 单例实例
+     */
+    static getInstance(): Logger;
+    /**
+     * 设置输出格式，更新静默状态
+     * @param outputFormat 输出格式
+     */
+    setOutputFormat(outputFormat: string | null | undefined): void;
+    /**
+     * 信息日志（输出到 stdout）
+     * json 模式下会被静默
+     */
+    info(message: string, ...optionalParams: any[]): void;
+    /**
+     * 警告日志（输出到 stdout）
+     * json 模式下会被静默
+     */
+    warn(message: string, ...optionalParams: any[]): void;
+    /**
+     * 成功日志（输出到 stdout）
+     * json 模式下会被静默
+     */
+    success(message: string): void;
+    /**
+     * 错误日志（输出到 stderr）
+     * 始终输出，不受 silent 影响
+     */
+    error(message: string, ...optionalParams: any[]): void;
+    /**
+     * 调试日志（输出到 stdout）
+     * json 模式下会被静默
+     */
+    debug(message: string): void;
+    /**
+     * JSON 数据输出（输出到 stdout）
+     * 输出格式化的 JSON 字符串
+     * @param data 要输出的数据对象
+     */
+    json(data: any): void;
+    /**
+     * 表格输出（输出到 stdout）
+     * json 模式下会被静默
+     */
+    table(data: any): void;
+    /**
+     * 检查是否处于静默模式
+     */
+    isSilent(): boolean;
+}
+export declare const logger: Logger;