midway-fatcms 0.0.1-beta.24 → 0.0.1-beta.25

package/src/service/asyncTask/handler/ExportExcelAsyncTaskHandler.ts

@@ -1,5 +1,5 @@
 import { IMidwayKoaContext } from '@midwayjs/koa';
-import { ISysAsyncTaskHandler, SysAsyncTaskContext } from '@/models/AsyncTaskModel';
+import { ISysAsyncTaskHandler, SysAsyncTaskContext, SysAsyncTaskStatus } from '@/models/AsyncTaskModel';
 import { ANONYMOUS_CONTEXT } from '@/schedule';
 import { IExcelHeaderInfo, IExcelAsyncTaskHandler } from './ExcelInfoModel';
 import { SysAsyncFileFormat } from '@/models/AsyncTaskModel';
@@ -14,6 +14,7 @@ import * as fs2 from 'node:fs/promises';
 import * as path from 'node:path';
 import { parseJsonObject } from '@/libs/utils/functions';
 import { UserSessionInfo } from '@/models/userSession';
+import { errorToString } from '@/libs/utils/errorToString';
 
 const indexRef = { current: 0 };
 
@@ -33,7 +34,7 @@ function getExcelAsyncTaskHandler(asyncTaskContext: SysAsyncTaskContext, ctx: IM
   if (inputParams && inputParams.appType === StdCrudExportInputParamsAppType.INNER_HTTP) {
     return new ExportExcelByInnerHttpHandler(asyncTaskContext, inputParams, ctx);
   }
-  throw new Error('[getExcelAsyncTaskHandler]appType不支持');
+  throw new Error('[getExcelAsyncTaskHandler]appType不支持；appType = ' + inputParams.appType);
 }
 
 /**
@@ -63,7 +64,10 @@ class ExportExcelAsyncTask {
   }
 
   async executeWithContext() {
-    this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext start');
+    const taskElement = this.asyncTaskContext.task;
+    const taskId = _.get(this.asyncTaskContext, 'task.id');
+
+    this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext start, taskId=' + taskId);
 
     const pageSize = await this.excelAsyncTaskHandler.getPageSize();
 
@@ -94,29 +98,43 @@ class ExportExcelAsyncTask {
 
     let processed_records = 0;
 
-    if (typeof totalCount === 'number' && totalCount > 0) {
-      const batchCount = Math.ceil(totalCount / pageSize);
-      for (let i = 0; i < batchCount; i++) {
-        const num = await this.writeExcelBatchData(csvStream, i + 1, pageSize);
-        processed_records = processed_records + num;
-        const progress = Math.round((processed_records / totalCount) * 100);
-        await this.asyncTaskContext.updateTaskStatus({
-          processed_records,
-          progress,
-        });
+    try {
+      if (typeof totalCount === 'number' && totalCount > 0) {
+        const batchCount = Math.ceil(totalCount / pageSize);
+        for (let i = 0; i < batchCount; i++) {
+          const num = await this.writeExcelBatchData(csvStream, i + 1, pageSize);
+          processed_records = processed_records + num;
+          const progress = Math.round((processed_records / totalCount) * 100);
+          await this.asyncTaskContext.updateTaskStatus({
+            processed_records,
+            progress,
+          });
+        }
       }
+
+      taskElement.task_status = SysAsyncTaskStatus.SUCCEEDED;
+    } catch (error) {
+      taskElement.task_status = SysAsyncTaskStatus.FAILED;
+      taskElement.error_message = errorToString(error);
+      const progress = Math.round((processed_records / totalCount) * 100);
+      await this.asyncTaskContext.updateTaskStatus({
+        processed_records,
+        progress,
+        task_status: taskElement.task_status,
+        error_message: taskElement.error_message,
+      });
     }
 
     csvStream.end();
     ws.on('finish', async () => {
-      this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext finish');
+      this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext finish, taskId=' + taskId);
       const fsStat = await fs2.stat(diskFilePath);
       const output_file_size = fsStat.size;
       this.asyncTaskContext.updateTaskStatus({
         output_file_size,
       });
     });
-    this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext end');
+    this.ctx.logger.info('[ExportExcelAsyncTask] executeWithContext end, taskId=' + taskId);
   }
 
   private formatToCsvHeader(headerColumns: IExcelHeaderInfo[]): string[] {
@@ -209,7 +227,10 @@ class ExportExcelAsyncTask {
  */
 export class ExportExcelAsyncTaskHandler implements ISysAsyncTaskHandler {
   public async execute(asyncTaskContext: SysAsyncTaskContext): Promise<any> {
-    console.log('[ExportExcelAsyncTaskHandler] execute');
+    const taskId = _.get(asyncTaskContext, 'task.id');
+
+    console.log('[ExportExcelAsyncTaskHandler] execute, taskId=>' + taskId);
+
     const res = await ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx: IMidwayKoaContext) => {
       const createdUserSession = parseJsonObject(asyncTaskContext?.task?.created_user_session);
       ctx.userSession = new UserSessionInfo(createdUserSession, false);