@nest-omni/core 4.1.3-2 → 4.1.3-22

package/audit/services/entity-audit.service.js

@@ -21,7 +21,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityAuditService = void 0;
+exports.EntityAuditService = exports.AUDIT_CONSTANTS = void 0;
+exports.registerEntityClass = registerEntityClass;
+exports.getEntityClass = getEntityClass;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
@@ -31,34 +33,93 @@ const enums_1 = require("../enums");
 const audit_context_service_1 = require("./audit-context.service");
 const audit_strategy_service_1 = require("./audit-strategy.service");
 const multi_database_service_1 = require("./multi-database.service");
+const operation_description_service_1 = require("./operation-description.service");
 const dto_1 = require("../../common/dto");
+const entity_audit_decorator_1 = require("../decorators/entity-audit.decorator");
+const transaction_1 = require("@nest-omni/transaction");
+/**
+ * 审计配置常量
+ */
+exports.AUDIT_CONSTANTS = {
+    /** 深度比较的最大深度限制 */
+    MAX_DIFF_DEPTH: 5,
+    /** 深度比较的最大键数量限制 */
+    MAX_KEYS: 100,
+    /** 描述的最大长度 */
+    MAX_DESCRIPTION_LENGTH: 1000,
+    /** 哈希截断长度 */
+    HASH_TRUNCATE_LENGTH: 64,
+    /** 部分掩码显示的字符数 */
+    PARTIAL_MASK_CHARS: 2,
+};
+/**
+ * 实体类注册表 - 用于在运行时通过 entityType 字符串获取实体类引用
+ */
+const ENTITY_CLASS_REGISTRY = new Map();
+/**
+ * 注册实体类到注册表
+ */
+function registerEntityClass(entityType, entityClass) {
+    ENTITY_CLASS_REGISTRY.set(entityType, entityClass);
+}
+/**
+ * 获取实体类
+ */
+function getEntityClass(entityType) {
+    return ENTITY_CLASS_REGISTRY.get(entityType);
+}
+/**
+ * 实体审计服务
+ */
 let EntityAuditService = class EntityAuditService {
-    constructor(auditLogRepository, transactionRepository, entityManager, contextService, multiDbService, auditStrategy = new audit_strategy_service_1.DefaultAuditStrategy(), config, auditConnectionName) {
+    constructor(auditLogRepository, transactionRepository, manualOperationRepository, entityManager, contextService, multiDbService, auditStrategy = new audit_strategy_service_1.DefaultAuditStrategy(), config, auditConnectionName, actionSummaryRepository, descriptionService) {
         this.auditLogRepository = auditLogRepository;
         this.transactionRepository = transactionRepository;
+        this.manualOperationRepository = manualOperationRepository;
         this.entityManager = entityManager;
         this.contextService = contextService;
         this.multiDbService = multiDbService;
         this.auditStrategy = auditStrategy;
         this.config = config;
+        this.actionSummaryRepository = actionSummaryRepository;
+        this.descriptionService = descriptionService;
         this.auditConnectionName = auditConnectionName || 'default';
     }
+    /**
+     * 记录实体变更
+     */
     logEntityChange(entityType_1, entityId_1, operation_1, oldValue_1, newValue_1) {
         return __awaiter(this, arguments, void 0, function* (entityType, entityId, operation, oldValue, newValue, metadata = {}) {
-            var _a, _b;
+            // 检查是否应该记录
             if (!this.auditStrategy.shouldRecord(entityType, operation)) {
                 return null;
             }
+            // 获取记录策略
             const recordStrategy = this.auditStrategy.getRecordStrategy(entityType, operation);
             if (recordStrategy === enums_1.RecordStrategy.DISABLED) {
                 return null;
             }
+            // 获取字段过滤器
             const fieldFilter = this.auditStrategy.getFieldFilter(entityType);
+            // 过滤和脱敏字段
             const filteredOldValue = this.filterAndMaskFields(oldValue, fieldFilter);
             const filteredNewValue = this.filterAndMaskFields(newValue, fieldFilter);
+            // 计算变更字段
             const changedFields = this.calculateChangedFields(filteredOldValue, filteredNewValue);
-            const changedFieldPaths = this.calculateChangedFieldPaths(filteredOldValue, filteredNewValue);
+            // 生成字段级别的变更详情（前后对比）
+            // CREATE 操作不需要 changeDetails，因为只有新值没有旧值
+            const changeDetails = operation === enums_1.AuditOperation.CREATE
+                ? undefined
+                : this.generateChangeDetails(entityType, filteredOldValue, filteredNewValue, changedFields);
+            // 获取上下文信息
             const context = yield this.contextService.getCurrentContext();
+            // 准备模板键和参数
+            const templateKey = metadata.operationTemplateKey || `${entityType}.${operation.toLowerCase()}`;
+            const descriptionParams = Object.assign({ entityType,
+                entityId, operation: operation.toLowerCase(), changedFields: changedFields.join(', '), changedFieldsCount: changedFields.length }, metadata.descriptionParams);
+            // 生成描述（优先使用模板）
+            const description = yield this.generateDescriptionFromTemplate(templateKey, descriptionParams, operation, entityType, entityId, changedFields);
+            // 创建审计日志
             const auditLog = this.auditLogRepository.create({
                 entityType,
                 entityId,
@@ -66,28 +127,37 @@ let EntityAuditService = class EntityAuditService {
                 oldValue: filteredOldValue,
                 newValue: filteredNewValue,
                 changedFields,
-                changedFieldPaths: changedFieldPaths.join(','),
+                changeDetails,
                 userId: context.userId || metadata.userId,
                 username: context.username || metadata.username,
                 requestId: context.requestId || metadata.requestId,
                 requestIp: context.requestIp || metadata.requestIp,
                 userAgent: context.userAgent || metadata.userAgent,
-                description: this.generateDescription(operation, entityType, entityId, changedFields),
-                hashChain: ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.security) === null || _b === void 0 ? void 0 : _b.hashChainEnabled)
-                    ? yield this.generateHashChain(entityType, entityId, filteredNewValue)
-                    : undefined,
+                description,
+                operationTemplateKey: templateKey,
+                descriptionParams,
+                // 新增：审计动作关联字段
+                auditActionId: metadata.auditActionId,
+                auditActionName: metadata.auditActionName,
+                sequenceInAction: metadata.sequenceInAction || 0,
             });
+            // 保存变更日志
             const savedLog = yield this.auditLogRepository.save(auditLog);
             return savedLog;
         });
     }
+    /**
+     * 查询审计日志
+     */
     getAuditLogs(query) {
         return __awaiter(this, void 0, void 0, function* () {
+            // 应用默认值
             const page = query.page || 1;
             const limit = query.limit || 20;
             const sortBy = query.sortBy || 'createdAt';
             const sortOrder = query.sortOrder || 'DESC';
             const queryBuilder = this.auditLogRepository.createQueryBuilder('log');
+            // 应用过滤条件
             if (query.entityType) {
                 queryBuilder.andWhere('log.entityType = :entityType', { entityType: query.entityType });
             }
@@ -111,7 +181,9 @@ let EntityAuditService = class EntityAuditService {
                     search: `%${query.search}%`,
                 });
             }
+            // 应用排序
             queryBuilder.orderBy(`log.${sortBy}`, sortOrder);
+            // 应用分页
             const skip = (page - 1) * limit;
             queryBuilder.skip(skip).take(limit);
             const [data, total] = yield queryBuilder.getManyAndCount();
@@ -124,6 +196,9 @@ let EntityAuditService = class EntityAuditService {
             return new dto_1.PageDto(data, pageMetaDto);
         });
     }
+    /**
+     * 比较实体差异
+     */
     compareEntities(entityType, entityId, fromLogId, toLogId) {
         return __awaiter(this, void 0, void 0, function* () {
             let fromData = {};
@@ -137,6 +212,7 @@ let EntityAuditService = class EntityAuditService {
                 toData = (toLog === null || toLog === void 0 ? void 0 : toLog.newValue) || {};
             }
             else {
+                // 获取最新的日志
                 const latestLog = yield this.auditLogRepository.findOne({
                     where: { entityType, entityId },
                     order: { createdAt: 'DESC' },
@@ -146,6 +222,9 @@ let EntityAuditService = class EntityAuditService {
             return this.compareSnapshotData(fromData, toData);
         });
     }
+    /**
+     * 预检查恢复操作
+     */
     preCheckRestore(entityType, entityId, auditLogId) {
         return __awaiter(this, void 0, void 0, function* () {
             const auditLog = yield this.auditLogRepository.findOne({ where: { id: auditLogId } });
@@ -163,8 +242,11 @@ let EntityAuditService = class EntityAuditService {
                     warnings: [],
                 };
             }
+            // 获取当前实体状态
             const repository = this.entityManager.getRepository(entityType);
-            const currentEntity = yield repository.findOne({ where: { id: entityId } });
+            const currentEntity = yield repository.findOne({
+                where: { id: entityId },
+            });
             if (!currentEntity) {
                 return {
                     canRestore: false,
@@ -179,6 +261,7 @@ let EntityAuditService = class EntityAuditService {
                     warnings: [],
                 };
             }
+            // 检查冲突
             const conflicts = this.detectConflicts(currentEntity, auditLog.oldValue);
             return {
                 canRestore: conflicts.length === 0,
@@ -187,6 +270,9 @@ let EntityAuditService = class EntityAuditService {
             };
         });
     }
+    /**
+     * 恢复实体
+     */
     restoreEntity(entityType_1, entityId_1, auditLogId_1) {
         return __awaiter(this, arguments, void 0, function* (entityType, entityId, auditLogId, options = {}) {
             const auditLog = yield this.auditLogRepository.findOne({ where: { id: auditLogId } });
@@ -196,6 +282,7 @@ let EntityAuditService = class EntityAuditService {
                     message: '审计日志不存在',
                 };
             }
+            // 预检查
             const preCheckResult = yield this.preCheckRestore(entityType, entityId, auditLogId);
             if (!preCheckResult.canRestore && !options.force) {
                 return {
@@ -205,10 +292,13 @@ let EntityAuditService = class EntityAuditService {
                 };
             }
             try {
+                // 获取指定的数据库连接
                 const connectionName = options.connectionName || 'default';
-                const dataSource = yield this.multiDbService.getDataSource(connectionName);
+                const dataSource = (0, transaction_1.getDataSource)(connectionName);
                 const repository = dataSource.getRepository(entityType);
+                // 恢复实体
                 const restoreData = Object.assign({}, auditLog.oldValue);
+                // 应用字段过滤
                 if (options.includeFields && options.includeFields.length > 0) {
                     Object.keys(restoreData).forEach((key) => {
                         if (!options.includeFields.includes(key)) {
@@ -221,8 +311,10 @@ let EntityAuditService = class EntityAuditService {
                         delete restoreData[field];
                     });
                 }
+                // 执行恢复
                 if (!options.dryRun) {
                     yield repository.update({ id: entityId }, restoreData);
+                    // 记录恢复操作
                     yield this.logEntityChange(entityType, entityId, enums_1.AuditOperation.RESTORE, auditLog.newValue, restoreData);
                 }
                 return {
@@ -239,26 +331,96 @@ let EntityAuditService = class EntityAuditService {
             }
         });
     }
+    /**
+     * 计算变更字段（支持嵌套路径）
+     */
     calculateChangedFields(oldValue, newValue) {
-        const changedFields = [];
-        const allFields = new Set([...Object.keys(oldValue || {}), ...Object.keys(newValue || {})]);
-        for (const field of allFields) {
-            const oldVal = oldValue === null || oldValue === void 0 ? void 0 : oldValue[field];
-            const newVal = newValue === null || newValue === void 0 ? void 0 : newValue[field];
-            if (!this.deepEqual(oldVal, newVal)) {
-                changedFields.push(field);
-            }
-        }
-        return changedFields;
+        // 使用 deepDiff 获取所有变更，包括嵌套字段
+        const diffChanges = this.deepDiff(oldValue, newValue);
+        // 将路径数组转换为点号分隔的字符串
+        return diffChanges.map(change => change.path.join('.'));
     }
-    calculateChangedFieldPaths(oldValue, newValue) {
-        const changedPaths = [];
-        const diff = this.deepDiff(oldValue, newValue);
-        for (const change of diff) {
-            changedPaths.push(change.path.join('.'));
+    /**
+     * 生成字段级别的变更详情（前后对比，支持嵌套路径和装饰器值映射）
+     */
+    generateChangeDetails(entityType, oldValue, newValue, changedFields) {
+        const changeDetails = [];
+        // 使用 deepDiff 获取详细变更信息
+        const diffChanges = this.deepDiff(oldValue, newValue);
+        // 尝试获取实体类（用于装饰器值映射）
+        const entityClass = getEntityClass(entityType);
+        for (const change of diffChanges) {
+            const pathStr = change.path.join('.');
+            const oldVal = change.oldValue;
+            const newVal = change.newValue;
+            const fieldName = change.path[0]; // 顶层字段名
+            // 确定变更类型
+            let changeType;
+            if (change.type === 'ADD') {
+                changeType = enums_1.ChangeType.ADDED;
+            }
+            else if (change.type === 'REMOVE') {
+                changeType = enums_1.ChangeType.REMOVED;
+            }
+            else {
+                changeType = enums_1.ChangeType.MODIFIED;
+            }
+            // 尝试从装饰器获取字段标签（支持多语言）
+            let fieldLabels;
+            let displayOldValue;
+            let displayNewValue;
+            if (entityClass) {
+                try {
+                    // 获取字段标签（多语言）
+                    const supportedLanguages = ['zh', 'en', 'ja'];
+                    fieldLabels = {};
+                    for (const lang of supportedLanguages) {
+                        const label = (0, entity_audit_decorator_1.getFieldLabel)(entityClass, pathStr, lang);
+                        if (label && label !== pathStr) {
+                            fieldLabels[lang] = label;
+                        }
+                    }
+                    // 获取字段值的标签（多语言值映射）
+                    if (oldVal !== null && oldVal !== undefined) {
+                        const oldValueLabel = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, oldVal, 'zh');
+                        if (oldValueLabel !== oldVal) {
+                            // 如果有映射值，创建多语言映射
+                            displayOldValue = {};
+                            for (const lang of supportedLanguages) {
+                                displayOldValue[lang] = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, oldVal, lang);
+                            }
+                        }
+                    }
+                    if (newVal !== null && newVal !== undefined) {
+                        const newValueLabel = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, newVal, 'zh');
+                        if (newValueLabel !== newVal) {
+                            // 如果有映射值，创建多语言映射
+                            displayNewValue = {};
+                            for (const lang of supportedLanguages) {
+                                displayNewValue[lang] = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, newVal, lang);
+                            }
+                        }
+                    }
+                }
+                catch (error) {
+                    // 忽略错误，使用默认值
+                }
+            }
+            changeDetails.push({
+                fieldName: pathStr,
+                fieldLabels: Object.keys(fieldLabels || {}).length > 0 ? fieldLabels : undefined,
+                oldValue: oldVal,
+                newValue: newVal,
+                displayOldValue,
+                displayNewValue,
+                changeType,
+            });
         }
-        return changedPaths;
+        return changeDetails;
     }
+    /**
+     * 深度比较对象
+     */
     deepEqual(a, b) {
         if (a === b)
             return true;
@@ -282,13 +444,18 @@ let EntityAuditService = class EntityAuditService {
         }
         return true;
     }
-    deepDiff(oldObj, newObj, path = []) {
-        var _a;
+    /**
+     * 深度差异比较
+     */
+    deepDiff(oldObj, newObj, path = [], visited = new WeakSet()) {
+        var _a, _b;
         const changes = [];
-        const maxDepth = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.maxDiffDepth) || 5;
+        const maxDepth = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.maxDiffDepth) !== null && _b !== void 0 ? _b : exports.AUDIT_CONSTANTS.MAX_DIFF_DEPTH;
+        // 防止过深
         if (path.length > maxDepth) {
             return changes;
         }
+        // 处理基本类型
         if (typeof oldObj !== 'object' || oldObj === null) {
             if (oldObj !== newObj) {
                 changes.push({
@@ -300,6 +467,20 @@ let EntityAuditService = class EntityAuditService {
             }
             return changes;
         }
+        // 检测循环引用
+        if (visited.has(oldObj)) {
+            // 检测到循环引用,停止递归
+            return changes;
+        }
+        visited.add(oldObj);
+        // 如果newObj也是对象,也加入访问集合
+        if (typeof newObj === 'object' && newObj !== null) {
+            if (visited.has(newObj)) {
+                return changes;
+            }
+            visited.add(newObj);
+        }
+        // 处理数组
         if (Array.isArray(oldObj)) {
             if (!Array.isArray(newObj)) {
                 changes.push({
@@ -320,11 +501,22 @@ let EntityAuditService = class EntityAuditService {
                 return changes;
             }
             for (let i = 0; i < oldObj.length; i++) {
-                changes.push(...this.deepDiff(oldObj[i], newObj[i], [...path, i.toString()]));
+                changes.push(...this.deepDiff(oldObj[i], newObj[i], [...path, i.toString()], visited));
             }
             return changes;
         }
+        // 处理对象
         const allKeys = new Set([...Object.keys(oldObj), ...Object.keys(newObj)]);
+        // 添加键数量限制，防止内存溢出
+        if (allKeys.size > exports.AUDIT_CONSTANTS.MAX_KEYS) {
+            changes.push({
+                path,
+                type: 'CHANGE',
+                oldValue: `[Object with too many keys: ${allKeys.size}]`,
+                newValue: `[Object with too many keys: ${allKeys.size}]`,
+            });
+            return changes;
+        }
         for (const key of allKeys) {
             const oldVal = oldObj[key];
             const newVal = newObj[key];
@@ -345,11 +537,14 @@ let EntityAuditService = class EntityAuditService {
                 });
             }
             else {
-                changes.push(...this.deepDiff(oldVal, newVal, [...path, key]));
+                changes.push(...this.deepDiff(oldVal, newVal, [...path, key], visited));
             }
         }
         return changes;
     }
+    /**
+     * 比较快照数据
+     */
     compareSnapshotData(fromData, toData) {
         const changes = this.deepDiff(fromData, toData);
         return {
@@ -361,6 +556,9 @@ let EntityAuditService = class EntityAuditService {
             },
         };
     }
+    /**
+     * 过滤和脱敏字段
+     */
     filterAndMaskFields(data, fieldFilter, path = []) {
         if (typeof data !== 'object' || data === null) {
             return data;
@@ -368,14 +566,17 @@ let EntityAuditService = class EntityAuditService {
         const result = {};
         for (const [key, value] of Object.entries(data)) {
             const currentPath = [...path, key];
+            // 检查是否应该包含此字段
             if (!fieldFilter.shouldIncludeField(key, currentPath)) {
                 continue;
             }
+            // 检查是否应该脱敏此字段
             if (fieldFilter.shouldMaskField(key, currentPath)) {
                 const maskingStrategy = fieldFilter.getMaskingStrategy(key, currentPath);
                 result[key] = this.applyMasking(value, maskingStrategy);
             }
             else if (typeof value === 'object' && value !== null) {
+                // 递归处理嵌套对象
                 result[key] = this.filterAndMaskFields(value, fieldFilter, currentPath);
             }
             else {
@@ -384,6 +585,9 @@ let EntityAuditService = class EntityAuditService {
         }
         return result;
     }
+    /**
+     * 应用脱敏策略
+     */
     applyMasking(value, strategy) {
         if (value == null)
             return value;
@@ -400,42 +604,65 @@ let EntityAuditService = class EntityAuditService {
                 return '***MASKED***';
         }
     }
+    /**
+     * 哈希值
+     */
     hashValue(value) {
         const strValue = String(value);
         return (0, crypto_1.createHash)('sha256').update(strValue).digest('hex');
     }
+    /**
+     * 掩码值
+     */
     maskValue(value) {
         const strValue = String(value);
         return '*'.repeat(strValue.length);
     }
+    /**
+     * 部分掩码值
+     */
     partialMaskValue(value) {
         const strValue = String(value);
-        if (strValue.length <= 4) {
+        const maskChars = exports.AUDIT_CONSTANTS.PARTIAL_MASK_CHARS;
+        if (strValue.length <= maskChars * 2) {
             return '*'.repeat(strValue.length);
         }
-        return (strValue.substring(0, 2) +
-            '*'.repeat(strValue.length - 4) +
-            strValue.substring(strValue.length - 2));
+        return (strValue.substring(0, maskChars) +
+            '*'.repeat(strValue.length - maskChars * 2) +
+            strValue.substring(strValue.length - maskChars));
     }
-    generateHashChain(entityType, entityId, data) {
+    /**
+     * 生成描述（支持多语言）
+     * @param operation 操作类型
+     * @param entityType 实体类型
+     * @param entityId 实体ID
+     * @param changedFields 变更字段列表
+     * @param language 语言（默认中文）
+     * @param entityClass 实体类（可选，用于获取实体标签）
+     */
+    /**
+     * 使用模板生成描述（优先使用 OperationDescriptionService）
+     */
+    generateDescriptionFromTemplate(templateKey, descriptionParams, operation, entityType, entityId, changedFields) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const lastLog = yield this.auditLogRepository.findOne({
-                where: { entityType, entityId },
-                order: { createdAt: 'DESC' },
-            });
-            const previousHash = ((_a = lastLog === null || lastLog === void 0 ? void 0 : lastLog.hashChain) === null || _a === void 0 ? void 0 : _a.currentHash) || '';
-            const currentData = JSON.stringify(data);
-            const hashAlgorithm = ((_c = (_b = this.config) === null || _b === void 0 ? void 0 : _b.security) === null || _c === void 0 ? void 0 : _c.hashAlgorithm) || 'sha256';
-            const currentHash = (0, crypto_1.createHash)(hashAlgorithm).update(currentData + previousHash).digest('hex');
-            return {
-                previousHash,
-                currentHash,
-                algorithm: hashAlgorithm,
-            };
+            // 优先尝试使用 OperationDescriptionService
+            if (this.descriptionService) {
+                try {
+                    const templateDescription = yield this.descriptionService.generateDescription(templateKey, descriptionParams, 'zh');
+                    // 如果成功获取到模板描述且不是原始的 templateKey，则使用它
+                    if (templateDescription && templateDescription !== templateKey) {
+                        return templateDescription;
+                    }
+                }
+                catch (error) {
+                    // 模板服务失败，降级到原有方式
+                }
+            }
+            // 降级：使用原有的描述生成逻辑
+            return this.generateDescription(operation, entityType, entityId, changedFields);
         });
     }
-    generateDescription(operation, entityType, entityId, changedFields) {
+    generateDescription(operation, entityType, entityId, changedFields, language = 'zh', entityClass) {
         const operationText = {
             [enums_1.AuditOperation.CREATE]: '创建',
             [enums_1.AuditOperation.UPDATE]: '更新',
@@ -443,11 +670,36 @@ let EntityAuditService = class EntityAuditService {
             [enums_1.AuditOperation.RESTORE]: '恢复',
         };
         const text = operationText[operation] || operation;
+        // 尝试获取实体的多语言标签
+        let entityLabel = entityType;
+        if (entityClass) {
+            try {
+                entityLabel = (0, entity_audit_decorator_1.getEntityLabel)(entityClass, language);
+            }
+            catch (error) {
+                // 忽略错误，使用默认的 entityType
+            }
+        }
         if (operation === enums_1.AuditOperation.UPDATE && changedFields.length > 0) {
-            return `${text} ${entityType}(${entityId}), 变更字段: ${changedFields.join(', ')}`;
+            // 对于更新操作，显示哪些字段发生了变化
+            const fieldLabels = changedFields.map(field => {
+                if (entityClass) {
+                    try {
+                        return (0, entity_audit_decorator_1.getFieldLabel)(entityClass, field, language);
+                    }
+                    catch (error) {
+                        return field;
+                    }
+                }
+                return field;
+            });
+            return `${text}${entityLabel}(${entityId}), 变更字段: ${fieldLabels.join('、')}`;
         }
-        return `${text} ${entityType}(${entityId})`;
+        return `${text}${entityLabel}(${entityId})`;
     }
+    /**
+     * 检测冲突
+     */
     detectConflicts(currentEntity, targetValue) {
         const conflicts = [];
         for (const [key, targetVal] of Object.entries(targetValue)) {
@@ -463,22 +715,550 @@ let EntityAuditService = class EntityAuditService {
         }
         return conflicts;
     }
+    // ========== 新增方法：支持模板和手动操作 ==========
+    /**
+     * 增强的记录实体变更（支持模板和结构化变更详情）
+     * @param data 审计数据
+     * @returns 审计日志实体
+     */
+    logEntityChangeWithTemplate(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            // 检查是否应该记录
+            if (!this.auditStrategy.shouldRecord(data.entityType, data.operation)) {
+                return null;
+            }
+            // 获取记录策略
+            const recordStrategy = this.auditStrategy.getRecordStrategy(data.entityType, data.operation);
+            if (recordStrategy === enums_1.RecordStrategy.DISABLED) {
+                return null;
+            }
+            // 获取字段过滤器
+            const fieldFilter = this.auditStrategy.getFieldFilter(data.entityType);
+            // 过滤和脱敏字段
+            const filteredOldValue = this.filterAndMaskFields(data.oldValue || {}, fieldFilter);
+            const filteredNewValue = this.filterAndMaskFields(data.newValue || {}, fieldFilter);
+            // 计算变更字段
+            const changedFields = data.changedFields || this.calculateChangedFields(filteredOldValue, filteredNewValue);
+            // 获取上下文信息
+            const context = yield this.contextService.getCurrentContext();
+            // 如果没有提供操作模板键，使用默认模板
+            const operationTemplateKey = data.operationTemplateKey || `${data.entityType}.${data.operation}`;
+            // 如果没有提供描述参数，使用实体数据
+            const descriptionParams = data.descriptionParams || Object.assign(Object.assign(Object.assign({}, filteredOldValue), filteredNewValue), { changedFields, changedFieldsCount: changedFields.length });
+            // 创建审计日志
+            const auditLog = this.auditLogRepository.create({
+                entityType: data.entityType,
+                entityId: data.entityId,
+                operation: data.operation,
+                oldValue: filteredOldValue,
+                newValue: filteredNewValue,
+                changedFields,
+                userId: context.userId || ((_a = data.metadata) === null || _a === void 0 ? void 0 : _a.userId),
+                username: context.username || ((_b = data.metadata) === null || _b === void 0 ? void 0 : _b.username),
+                requestId: context.requestId || ((_c = data.metadata) === null || _c === void 0 ? void 0 : _c.requestId),
+                requestIp: context.requestIp || ((_d = data.metadata) === null || _d === void 0 ? void 0 : _d.requestIp),
+                userAgent: context.userAgent || ((_e = data.metadata) === null || _e === void 0 ? void 0 : _e.userAgent),
+                description: this.generateDescription(data.operation, data.entityType, data.entityId, changedFields),
+                // 新增字段
+                operationTemplateKey,
+                descriptionParams,
+                changeDetails: data.changeDetails,
+            });
+            // 保存变更日志
+            const savedLog = yield this.auditLogRepository.save(auditLog);
+            return savedLog;
+        });
+    }
+    /**
+     * 记录手动操作
+     * @param data 手动操作数据
+     * @returns 手动操作日志实体
+     */
+    logManualOperation(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 获取上下文信息
+            const context = yield this.contextService.getCurrentContext();
+            const manualLog = this.manualOperationRepository.create({
+                transactionId: data.transactionId,
+                operationTemplateKey: data.operationTemplateKey,
+                descriptionParams: data.descriptionParams,
+                userId: data.userId || context.userId,
+                username: data.username || context.username,
+                requestIp: data.requestIp || context.requestIp,
+            });
+            return yield this.manualOperationRepository.save(manualLog);
+        });
+    }
+    /**
+     * 在事务中执行操作
+     * @param fn 执行函数
+     * @param options 事务选项
+     * @returns 执���结果
+     */
+    withTransaction(fn, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            // 获取上下文信息
+            const context = yield this.contextService.getCurrentContext();
+            // 创建事务
+            const transaction = this.transactionRepository.create({
+                description: ((_a = options === null || options === void 0 ? void 0 : options.descriptionParams) === null || _a === void 0 ? void 0 : _a.description) || 'Transaction',
+                status: 'PENDING',
+                entities: [],
+                userId: (options === null || options === void 0 ? void 0 : options.userId) || context.userId,
+                username: (options === null || options === void 0 ? void 0 : options.username) || context.username,
+                requestIp: (options === null || options === void 0 ? void 0 : options.requestIp) || context.requestIp,
+                operationTemplateKey: options === null || options === void 0 ? void 0 : options.operationTemplateKey,
+                descriptionParams: options === null || options === void 0 ? void 0 : options.descriptionParams,
+                metadata: options === null || options === void 0 ? void 0 : options.metadata,
+            });
+            const savedTransaction = yield this.transactionRepository.save(transaction);
+            const transactionId = savedTransaction.id;
+            try {
+                // 设置事务ID到上下文
+                yield this.contextService.setContext(Object.assign(Object.assign({}, context), { transactionId }));
+                // 执行操作
+                const result = yield fn(transactionId);
+                // 提交事务
+                yield this.transactionRepository.update(transactionId, {
+                    status: 'COMMITTED',
+                    completedAt: new Date(),
+                });
+                return result;
+            }
+            catch (error) {
+                // 回滚事务
+                yield this.transactionRepository.update(transactionId, {
+                    status: 'ROLLED_BACK',
+                    completedAt: new Date(),
+                });
+                throw error;
+            }
+        });
+    }
+    /**
+     * 获取当前事务ID
+     * @returns 当前事务ID或null
+     */
+    getCurrentTransactionId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const context = yield this.contextService.getCurrentContext();
+            return context.transactionId || null;
+        });
+    }
+    /**
+     * 设置当前事务ID
+     * @param transactionId 事务ID
+     */
+    setCurrentTransactionId(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const context = yield this.contextService.getCurrentContext();
+            yield this.contextService.setContext(Object.assign(Object.assign({}, context), { transactionId }));
+        });
+    }
+    /**
+     * 开始事务
+     * @param userId 用户ID
+     * @param userName 用户名
+     * @param ip IP地址
+     * @param operationTemplateKey 操作模板键
+     * @param descriptionParams 描述参数
+     * @returns 事务ID
+     */
+    beginTransaction(userId, userName, ip, operationTemplateKey, descriptionParams) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 获取上下文信息
+            const context = yield this.contextService.getCurrentContext();
+            // 创建事务
+            const transaction = this.transactionRepository.create({
+                description: (descriptionParams === null || descriptionParams === void 0 ? void 0 : descriptionParams.description) || 'Transaction',
+                status: 'pending',
+                entities: [],
+                userId: userId || context.userId,
+                username: userName || context.username,
+                requestIp: ip || context.requestIp,
+                operationTemplateKey,
+                descriptionParams,
+            });
+            const savedTransaction = yield this.transactionRepository.save(transaction);
+            return savedTransaction.id;
+        });
+    }
+    /**
+     * 提交事务
+     * @param transactionId 事务ID
+     */
+    commitTransaction(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.transactionRepository.update(transactionId, {
+                status: 'committed',
+                completedAt: new Date(),
+            });
+        });
+    }
+    /**
+     * 回滚事务
+     * @param transactionId 事务ID
+     */
+    rollbackTransaction(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.transactionRepository.update(transactionId, {
+                status: 'rolled_back',
+                completedAt: new Date(),
+            });
+        });
+    }
+    /**
+     * 查询审计动作汇总记录
+     */
+    getAuditActions(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.actionSummaryRepository) {
+                throw new Error('AuditActionSummaryEntity repository not available');
+            }
+            const { page = 1, limit = 20 } = options;
+            const queryBuilder = this.actionSummaryRepository.createQueryBuilder('action');
+            // 应用过滤条件
+            if (options.userId) {
+                queryBuilder.andWhere('action.userId = :userId', { userId: options.userId });
+            }
+            if (options.username) {
+                queryBuilder.andWhere('action.username LIKE :username', { username: `%${options.username}%` });
+            }
+            if (options.actionName) {
+                // 支持模糊匹配动作名
+                queryBuilder.andWhere('action.actionName LIKE :actionName', { actionName: `%${options.actionName}%` });
+            }
+            // 新增：全局关键词搜索（搜索多个字段）
+            if (options.keyword) {
+                queryBuilder.andWhere('(action.username LIKE :keyword OR action.actionName LIKE :keyword OR action.description LIKE :keyword)', { keyword: `%${options.keyword}%` });
+            }
+            if (options.success !== undefined) {
+                queryBuilder.andWhere('action.success = :success', { success: options.success });
+            }
+            if (options.startTime && options.endTime) {
+                queryBuilder.andWhere('action.createdAt BETWEEN :startTime AND :endTime', {
+                    startTime: options.startTime,
+                    endTime: options.endTime,
+                });
+            }
+            // 排序
+            queryBuilder.orderBy('action.createdAt', 'DESC');
+            // 分页
+            const skip = (page - 1) * limit;
+            queryBuilder.skip(skip).take(limit);
+            const [data, total] = yield queryBuilder.getManyAndCount();
+            const pageOptionsDto = new dto_1.PageOptionsDto();
+            Object.assign(pageOptionsDto, { page, pageSize: limit });
+            const pageMetaDto = new dto_1.PageMetaDto({
+                pageOptionsDto,
+                itemCount: total,
+            });
+            return new dto_1.PageDto(data, pageMetaDto);
+        });
+    }
+    /**
+     * 查询单个审计动作的详细信息（包含关联的实体变更）
+     * @param actionId 动作ID
+     * @param language 语言代码 (zh/en/ja)，默认 zh
+     */
+    getAuditActionDetail(actionId_1) {
+        return __awaiter(this, arguments, void 0, function* (actionId, language = 'zh') {
+            if (!this.actionSummaryRepository) {
+                throw new Error('AuditActionSummaryEntity repository not available');
+            }
+            // 查询汇总信息
+            const summary = yield this.actionSummaryRepository.findOne({
+                where: { id: actionId },
+            });
+            if (!summary) {
+                throw new Error(`Audit action with id ${actionId} not found`);
+            }
+            // 动态生成多语言描述
+            const description = yield this.generateLocalizedDescription(summary.operationTemplateKey, summary.actionName, summary.descriptionParams, summary.success, language);
+            // 查询关联的实体变更
+            const entityChanges = yield this.auditLogRepository.find({
+                where: { auditActionId: actionId },
+                order: { sequenceInAction: 'ASC' },
+            });
+            // 分析每个实体的详细变化（支持多语言）
+            const detailedChanges = entityChanges.map((change) => {
+                // 使用数据库中存储的 changeDetails，并根据语言转换
+                const changeDetails = this.localizeChangeDetails(change.changeDetails, language);
+                return {
+                    id: change.id,
+                    entityType: change.entityType,
+                    entityId: change.entityId,
+                    operation: change.operation,
+                    operationLabel: this.getOperationLabel(change.operation, language),
+                    description: change.description,
+                    sequenceInAction: change.sequenceInAction,
+                    createdAt: change.createdAt,
+                    // 数据快照
+                    oldValue: change.oldValue,
+                    newValue: change.newValue,
+                    // 详细的字段变化分析 (使用本地化的 changeDetails)
+                    changeDetails,
+                    changedFieldsCount: (changeDetails === null || changeDetails === void 0 ? void 0 : changeDetails.length) || 0,
+                    changedFields: change.changedFields,
+                };
+            });
+            // 统计信息
+            const statistics = {
+                totalChanges: entityChanges.length,
+                totalFieldChanges: detailedChanges.reduce((sum, c) => sum + c.changedFieldsCount, 0),
+                byEntityType: this.groupBy(entityChanges, 'entityType'),
+                byOperation: this.groupBy(entityChanges, 'operation'),
+                operationSequence: entityChanges.map((c) => ({
+                    sequence: c.sequenceInAction,
+                    entityType: c.entityType,
+                    operation: c.operation,
+                })),
+            };
+            return {
+                // 汇总信息（使用本地化描述）
+                summary: {
+                    id: summary.id,
+                    actionName: summary.actionName,
+                    operationTemplateKey: summary.operationTemplateKey,
+                    description,
+                    descriptionParams: summary.descriptionParams,
+                    success: summary.success,
+                    errorMessage: summary.errorMessage,
+                    duration: summary.duration,
+                    userId: summary.userId,
+                    username: summary.username,
+                    requestId: summary.requestId,
+                    requestIp: summary.requestIp,
+                    userAgent: summary.userAgent,
+                    entityChangesCount: summary.entityChangesCount,
+                    entityTypes: summary.entityTypes,
+                    operationStats: summary.operationStats,
+                    createdAt: summary.createdAt,
+                    metadata: summary.metadata,
+                },
+                // 原始实体变更记录
+                entityChanges,
+                // 详细的变化分析
+                detailedChanges,
+                // 统计信息
+                statistics,
+            };
+        });
+    }
+    /**
+     * 生成本地化的描述文本
+     */
+    generateLocalizedDescription(templateKey, actionName, params, success, language) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let template;
+            // 1. 尝试从模板服务获取多语言模板
+            if (templateKey && this.descriptionService) {
+                try {
+                    template = yield this.descriptionService.getTemplate(templateKey, language);
+                }
+                catch (error) {
+                    // 如果获取模板失败，继续使用默认逻辑
+                }
+            }
+            // 2. 如果没有模板，使用默认格式
+            if (!template) {
+                const actionLabels = {
+                    zh: { success: '执行操作', fail: '执行操作失败' },
+                    en: { success: 'Executed operation', fail: 'Operation failed' },
+                    ja: { success: '操作を実行', fail: '操作が失敗しました' },
+                };
+                const label = ((_a = actionLabels[language]) === null || _a === void 0 ? void 0 : _a[success ? 'success' : 'fail']) || actionLabels.zh[success ? 'success' : 'fail'];
+                template = `${label}: ${actionName}`;
+            }
+            // 3. 执行模板替换
+            return this.replaceTemplatePlaceholders(template, params);
+        });
+    }
+    /**
+     * 替换模板中的占位符
+     * @param template 模板字符串，如 "创建了产品 {name}，价格 ¥{price}"
+     * @param params 参数对象，如 { name: "iPhone", price: 999 }
+     * @returns 替换后的字符串
+     */
+    replaceTemplatePlaceholders(template, params) {
+        let result = template;
+        // 匹配 {paramName} 格式的占位符
+        const placeholderPattern = /\{([^}]+)\}/g;
+        result = result.replace(placeholderPattern, (match, paramName) => {
+            // 支持嵌套属性访问，如 {user.name}
+            const value = this.getNestedValue(params, paramName);
+            return value !== undefined && value !== null ? String(value) : match;
+        });
+        return result;
+    }
+    /**
+     * 获取嵌套对象的值
+     * @param obj 对象
+     * @param path 路径，如 "user.name" 或 "user.profile.age"
+     * @returns 值或 undefined
+     */
+    getNestedValue(obj, path) {
+        return path.split('.').reduce((current, key) => {
+            return current === null || current === void 0 ? void 0 : current[key];
+        }, obj);
+    }
+    /**
+     * 本地化 changeDetails（根据语言转换 fieldLabel 和 displayValue）
+     */
+    localizeChangeDetails(changeDetails, language) {
+        if (!changeDetails)
+            return undefined;
+        return changeDetails.map((detail) => {
+            var _a, _b, _c, _d, _e;
+            return (Object.assign(Object.assign({}, detail), { fieldLabel: ((_a = detail.fieldLabels) === null || _a === void 0 ? void 0 : _a[language]) || detail.fieldName, displayOldValue: (_c = (_b = detail.displayOldValue) === null || _b === void 0 ? void 0 : _b[language]) !== null && _c !== void 0 ? _c : detail.oldValue, displayNewValue: (_e = (_d = detail.displayNewValue) === null || _d === void 0 ? void 0 : _d[language]) !== null && _e !== void 0 ? _e : detail.newValue }));
+        });
+    }
+    /**
+     * 获取操作标签（支持多语言）
+     */
+    getOperationLabel(operation, language = 'zh') {
+        var _a, _b;
+        const labels = {
+            CREATE: { zh: '创建', en: 'Create', ja: '作成' },
+            UPDATE: { zh: '更新', en: 'Update', ja: '更新' },
+            DELETE: { zh: '删除', en: 'Delete', ja: '削除' },
+            RESTORE: { zh: '恢复', en: 'Restore', ja: '復元' },
+        };
+        return ((_a = labels[operation]) === null || _a === void 0 ? void 0 : _a[language]) || ((_b = labels[operation]) === null || _b === void 0 ? void 0 : _b.zh) || operation;
+    }
+    /**
+     * 分析字段变化（支持多语言）
+     * @param oldValue 旧值
+     * @param newValue 新值
+     * @param operation 操作类型
+     * @param entityClass 实体类（可选，用于获取字段和值的多语言标签）
+     * @param language 语言（默认中文）
+     */
+    analyzeFieldChanges(oldValue, newValue, operation, entityClass, language = 'zh') {
+        const changes = [];
+        const allFields = new Set([...Object.keys(oldValue), ...Object.keys(newValue)]);
+        for (const field of allFields) {
+            const oldVal = oldValue[field];
+            const newVal = newValue[field];
+            let changeType;
+            if (operation === enums_1.AuditOperation.CREATE) {
+                // 创建操作，所有字段都是新增
+                changeType = 'added';
+            }
+            else if (operation === enums_1.AuditOperation.DELETE) {
+                // 删除操作，所有字段都是移除
+                changeType = 'removed';
+            }
+            else {
+                // 更新操作，判断字段变化
+                if (oldVal === undefined && newVal !== undefined) {
+                    changeType = 'added';
+                }
+                else if (oldVal !== undefined && newVal === undefined) {
+                    changeType = 'removed';
+                }
+                else if (JSON.stringify(oldVal) !== JSON.stringify(newVal)) {
+                    changeType = 'modified';
+                }
+                else {
+                    changeType = 'unchanged';
+                }
+            }
+            // 跳过未变化的字段（对于UPDATE操作）
+            if (changeType === 'unchanged' && operation === enums_1.AuditOperation.UPDATE) {
+                continue;
+            }
+            // 获取字段的多语言标签
+            let fieldLabel = field;
+            if (entityClass) {
+                try {
+                    fieldLabel = (0, entity_audit_decorator_1.getFieldLabel)(entityClass, field, language);
+                }
+                catch (error) {
+                    // 忽略错误，使用原字段名
+                }
+            }
+            // 获取字段值的多语言标签
+            let displayOldValue = this.formatDisplayValue(oldVal);
+            let displayNewValue = this.formatDisplayValue(newVal);
+            if (entityClass) {
+                try {
+                    if (oldVal !== null && oldVal !== undefined) {
+                        const valueLabel = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, field, oldVal, language);
+                        if (valueLabel !== oldVal) {
+                            displayOldValue = valueLabel;
+                        }
+                    }
+                    if (newVal !== null && newVal !== undefined) {
+                        const valueLabel = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, field, newVal, language);
+                        if (valueLabel !== newVal) {
+                            displayNewValue = valueLabel;
+                        }
+                    }
+                }
+                catch (error) {
+                    // 忽略错误，使用默认格式化值
+                }
+            }
+            changes.push({
+                field,
+                fieldLabel,
+                oldValue: oldVal,
+                newValue: newVal,
+                changeType,
+                displayOldValue,
+                displayNewValue,
+            });
+        }
+        return changes;
+    }
+    /**
+     * 格式化显示值
+     */
+    formatDisplayValue(value) {
+        if (value === null || value === undefined) {
+            return '';
+        }
+        if (typeof value === 'object') {
+            return JSON.stringify(value);
+        }
+        return String(value);
+    }
+    /**
+     * 按字段分组统计
+     */
+    groupBy(items, field) {
+        return items.reduce((acc, item) => {
+            const key = item[field];
+            acc[key] = (acc[key] || 0) + 1;
+            return acc;
+        }, {});
+    }
 };
 exports.EntityAuditService = EntityAuditService;
 exports.EntityAuditService = EntityAuditService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, typeorm_1.InjectRepository)(entities_1.EntityAuditLogEntity)),
     __param(1, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity)),
-    __param(2, (0, common_1.Inject)('AUDIT_ENTITY_MANAGER')),
-    __param(5, (0, common_1.Optional)()),
-    __param(5, (0, common_1.Inject)('AUDIT_STRATEGY')),
+    __param(2, (0, typeorm_1.InjectRepository)(entities_1.ManualOperationLogEntity)),
+    __param(3, (0, common_1.Inject)('AUDIT_ENTITY_MANAGER')),
     __param(6, (0, common_1.Optional)()),
-    __param(6, (0, common_1.Inject)('AUDIT_CONFIG')),
+    __param(6, (0, common_1.Inject)('AUDIT_STRATEGY')),
     __param(7, (0, common_1.Optional)()),
-    __param(7, (0, common_1.Inject)('AUDIT_CONNECTION_NAME')),
+    __param(7, (0, common_1.Inject)('AUDIT_CONFIG')),
+    __param(8, (0, common_1.Optional)()),
+    __param(8, (0, common_1.Inject)('AUDIT_CONNECTION_NAME')),
+    __param(9, (0, common_1.Optional)()),
+    __param(9, (0, typeorm_1.InjectRepository)(entities_1.AuditActionSummaryEntity)),
+    __param(10, (0, common_1.Optional)()),
     __metadata("design:paramtypes", [typeorm_2.Repository,
+        typeorm_2.Repository,
         typeorm_2.Repository,
         typeorm_2.EntityManager,
         audit_context_service_1.AuditContextService,
-        multi_database_service_1.MultiDatabaseService, Object, Object, String])
+        multi_database_service_1.MultiDatabaseService, Object, Object, String, typeorm_2.Repository,
+        operation_description_service_1.OperationDescriptionService])
 ], EntityAuditService);