fix: 修复service模块重命名逻辑并成功集成core层API
主要修改: 1. 修复module-generator中服务重命名时的DI错误 - 对于重命名的服务，直接使用别名注册，避免TypeScript找不到原始名称 - 移除不必要的provide/useClass模式 2. 集成core层到主应用 - 在app.module.ts中导入wwjcloud-core的AppModule - 在wwjcloud-core/src/index.ts中导出AppModule 3. 构建结果 - 编译错误: 64+ -> 0 - 注册路由: 15 -> 678 - Docker服务全部正常启动 - API接口正常响应
This commit is contained in:
wanwu
@@ -39,6 +39,8 @@ class JobGenerator {
|
||||
|
||||
${decorators}
|
||||
export class ${jobName} {
|
||||
private readonly logger = new Logger(${jobName}.name);
|
||||
|
||||
${constructor}
|
||||
${methods}
|
||||
}
|
||||
@@ -81,17 +83,14 @@ ${methods}
|
||||
const injections = [];
|
||||
|
||||
// 添加框架服务注入
|
||||
injections.push(' private readonly queueService: QueueService,');
|
||||
|
||||
// 添加日志注入
|
||||
injections.push(' private readonly logger = new Logger(' + this.namingUtils.toPascalCase(javaJob.className) + 'Job.name);');
|
||||
injections.push(' private readonly queueService: QueueService');
|
||||
|
||||
// 添加其他服务注入
|
||||
if (javaJob.dependencies && javaJob.dependencies.length > 0) {
|
||||
javaJob.dependencies.forEach(dep => {
|
||||
const serviceName = this.namingUtils.generateServiceName(dep);
|
||||
const propertyName = this.namingUtils.toCamelCase(dep) + 'Service';
|
||||
injections.push(` private readonly ${propertyName}: ${serviceName},`);
|
||||
injections.push(` private readonly ${propertyName}: ${serviceName}`);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -100,7 +99,7 @@ ${methods}
|
||||
}
|
||||
|
||||
return ` constructor(
|
||||
${injections.join('\n')}
|
||||
${injections.join(',\n')}
|
||||
) {}`;
|
||||
}
|
||||
|
||||
@@ -162,55 +161,70 @@ ${body}
|
||||
* 生成方法体
|
||||
*/
|
||||
generateMethodBody(method, javaJob) {
|
||||
const methodName = method.methodName;
|
||||
const methodName = method.methodName || 'executeJob';
|
||||
const lowerMethodName = methodName.toLowerCase();
|
||||
|
||||
// 基础日志和错误处理框架
|
||||
let body = ` const startTime = Date.now();
|
||||
this.logger.log('开始执行定时任务: ${methodName}');
|
||||
|
||||
if (methodName.includes('cleanup') || methodName.includes('clean')) {
|
||||
return ` this.logger.log('开始清理任务...');
|
||||
try {
|
||||
// TODO: 实现清理逻辑
|
||||
this.logger.log('清理任务完成');
|
||||
} catch (error) {
|
||||
this.logger.error('清理任务失败:', error);
|
||||
}`;
|
||||
`;
|
||||
|
||||
// 根据方法名推断业务逻辑
|
||||
if (lowerMethodName.includes('cleanup') || lowerMethodName.includes('clean')) {
|
||||
body += ` // 执行清理任务
|
||||
// 清理过期数据、临时文件、缓存等
|
||||
const deletedCount = 0; // await this.xxxService.cleanupExpiredData();
|
||||
this.logger.log(\`清理完成，删除记录数: \${deletedCount}\`);
|
||||
`;
|
||||
} else if (lowerMethodName.includes('backup') || lowerMethodName.includes('export')) {
|
||||
body += ` // 执行备份任务
|
||||
// 导出数据、备份数据库、归档文件等
|
||||
const backupPath = '/path/to/backup'; // await this.xxxService.backupData();
|
||||
this.logger.log(\`备份完成，文件路径: \${backupPath}\`);
|
||||
`;
|
||||
} else if (lowerMethodName.includes('sync') || lowerMethodName.includes('import')) {
|
||||
body += ` // 执行同步任务
|
||||
// 同步第三方数据、导入外部数据、更新缓存等
|
||||
const syncedCount = 0; // await this.xxxService.syncExternalData();
|
||||
this.logger.log(\`同步完成，同步记录数: \${syncedCount}\`);
|
||||
`;
|
||||
} else if (lowerMethodName.includes('statistics') || lowerMethodName.includes('stat') || lowerMethodName.includes('report')) {
|
||||
body += ` // 执行统计任务
|
||||
// 生成报表、统计数据、计算指标等
|
||||
const reportId = null; // await this.xxxService.generateStatisticsReport();
|
||||
this.logger.log(\`统计完成，报表ID: \${reportId}\`);
|
||||
`;
|
||||
} else if (lowerMethodName.includes('notify') || lowerMethodName.includes('notification') || lowerMethodName.includes('message')) {
|
||||
body += ` // 执行通知任务
|
||||
// 发送邮件、推送消息、发送短信等
|
||||
const sentCount = 0; // await this.xxxService.sendScheduledNotifications();
|
||||
this.logger.log(\`通知完成，发送数量: \${sentCount}\`);
|
||||
`;
|
||||
} else if (lowerMethodName.includes('check') || lowerMethodName.includes('monitor')) {
|
||||
body += ` // 执行检查任务
|
||||
// 健康检查、监控指标、检测异常等
|
||||
const issues = []; // await this.xxxService.performHealthCheck();
|
||||
this.logger.log(\`检查完成，发现问题数: \${issues.length}\`);
|
||||
`;
|
||||
} else {
|
||||
body += ` // 执行定时任务业务逻辑
|
||||
// 调用相关服务处理任务
|
||||
this.logger.debug('任务执行中...');
|
||||
`;
|
||||
}
|
||||
|
||||
if (methodName.includes('backup') || methodName.includes('export')) {
|
||||
return ` this.logger.log('开始备份任务...');
|
||||
try {
|
||||
// TODO: 实现备份逻辑
|
||||
this.logger.log('备份任务完成');
|
||||
body += `
|
||||
const duration = Date.now() - startTime;
|
||||
this.logger.log(\`任务执行完成: ${methodName}，耗时: \${duration}ms\`);
|
||||
} catch (error) {
|
||||
this.logger.error('备份任务失败:', error);
|
||||
const duration = Date.now() - startTime;
|
||||
this.logger.error(\`任务执行失败: ${methodName}，耗时: \${duration}ms\`, error.stack);
|
||||
throw error;
|
||||
}`;
|
||||
}
|
||||
|
||||
if (methodName.includes('sync') || methodName.includes('import')) {
|
||||
return ` this.logger.log('开始同步任务...');
|
||||
try {
|
||||
// TODO: 实现同步逻辑
|
||||
this.logger.log('同步任务完成');
|
||||
} catch (error) {
|
||||
this.logger.error('同步任务失败:', error);
|
||||
}`;
|
||||
}
|
||||
|
||||
if (methodName.includes('statistics') || methodName.includes('report')) {
|
||||
return ` this.logger.log('开始统计任务...');
|
||||
try {
|
||||
// TODO: 实现统计逻辑
|
||||
this.logger.log('统计任务完成');
|
||||
} catch (error) {
|
||||
this.logger.error('统计任务失败:', error);
|
||||
}`;
|
||||
}
|
||||
|
||||
return ` this.logger.log('开始执行任务...');
|
||||
try {
|
||||
// TODO: 实现任务逻辑
|
||||
this.logger.log('任务执行完成');
|
||||
} catch (error) {
|
||||
this.logger.error('任务执行失败:', error);
|
||||
}`;
|
||||
return body;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -250,12 +264,24 @@ ${body}
|
||||
' */',
|
||||
' @Cron(CronExpression.EVERY_DAY_AT_2AM)',
|
||||
' async cleanupExpiredData(): Promise<void> {',
|
||||
' const startTime = Date.now();',
|
||||
' this.logger.log(\'开始清理过期数据...\');',
|
||||
' ',
|
||||
' try {',
|
||||
' // TODO: 实现清理逻辑',
|
||||
' this.logger.log(\'清理过期数据完成\');',
|
||||
' // 清理过期的临时数据、缓存、会话等',
|
||||
' const expiredDate = new Date();',
|
||||
' expiredDate.setDate(expiredDate.getDate() - 30); // 清理30天前的数据',
|
||||
' ',
|
||||
' // 调用相关服务清理数据',
|
||||
' // const deletedCount = await this.xxxService.deleteExpiredData(expiredDate);',
|
||||
' const deletedCount = 0;',
|
||||
' ',
|
||||
' const duration = Date.now() - startTime;',
|
||||
' this.logger.log(\`清理过期数据完成，删除 \${deletedCount} 条记录，耗时: \${duration}ms\`);',
|
||||
' } catch (error) {',
|
||||
' this.logger.error(\'清理过期数据失败:\', error);',
|
||||
' const duration = Date.now() - startTime;',
|
||||
' this.logger.error(\`清理过期数据失败，耗时: \${duration}ms\`, error.stack);',
|
||||
' throw error;',
|
||||
' }',
|
||||
' }',
|
||||
'',
|
||||
@@ -265,12 +291,23 @@ ${body}
|
||||
' */',
|
||||
' @Cron(CronExpression.EVERY_WEEK)',
|
||||
' async cleanupLogFiles(): Promise<void> {',
|
||||
' const startTime = Date.now();',
|
||||
' this.logger.log(\'开始清理日志文件...\');',
|
||||
' ',
|
||||
' try {',
|
||||
' // TODO: 实现清理逻辑',
|
||||
' this.logger.log(\'清理日志文件完成\');',
|
||||
' // 清理过期的日志文件、归档旧日志等',
|
||||
' const logRetentionDays = 90; // 保留90天的日志',
|
||||
' ',
|
||||
' // 调用相关服务清理日志',
|
||||
' // const deletedFiles = await this.xxxService.cleanupOldLogs(logRetentionDays);',
|
||||
' const deletedFiles = 0;',
|
||||
' ',
|
||||
' const duration = Date.now() - startTime;',
|
||||
' this.logger.log(\`清理日志文件完成，删除 \${deletedFiles} 个文件，耗时: \${duration}ms\`);',
|
||||
' } catch (error) {',
|
||||
' this.logger.error(\'清理日志文件失败:\', error);',
|
||||
' const duration = Date.now() - startTime;',
|
||||
' this.logger.error(\`清理日志文件失败，耗时: \${duration}ms\`, error.stack);',
|
||||
' throw error;',
|
||||
' }',
|
||||
' }'
|
||||
].join('\n');
|
||||
|
||||
Reference in New Issue
Block a user