midway-fatcms 0.0.1-beta.13 → 0.0.1-beta.14

package/dist/controller/gateway/AsyncTaskController.js

@@ -30,7 +30,7 @@ function fixCancelBodyData(body, id) {
     body.condition = conditionObj;
     // fix data
     const dataObj = (body.data || {});
-    dataObj.task_status = AsyncTaskModel_1.TaskStatus.CANCELLED;
+    dataObj.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.CANCELLED;
     body.data = dataObj;
 }
 function fixCreateBodyData(body) {
@@ -39,7 +39,7 @@ function fixCreateBodyData(body) {
     }
     // fix data
     const dataObj = (body.data || {});
-    dataObj.task_status = AsyncTaskModel_1.TaskStatus.PENDING;
+    dataObj.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.PENDING;
 }
 /**
  * 异步任务框架

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from './controller/gateway/FileController';
 export * from './controller/gateway/ProxyApiGatewayController';
 export * from './controller/gateway/PublicApiController';
 export * from './controller/gateway/StaticController';
+export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
@@ -65,6 +66,8 @@ export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './service/asyncTask/AsyncTaskService';
+export * from './service/asyncTask/AsyncTaskRunnerService';
 export * from './models/userSession';
 export * from './models/bizmodels';
 export * from './models/SystemEntities';
@@ -72,6 +75,7 @@ export * from './models/SystemPerm';
 export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
+export * from './models/AsyncTaskModel';
 export * from './libs/utils/common-dto';
 export * from './libs/utils/crypto-utils';
 export * from './libs/utils/fatcms-request';

package/dist/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./controller/gateway/FileController"), exports);
 __exportStar(require("./controller/gateway/ProxyApiGatewayController"), exports);
 __exportStar(require("./controller/gateway/PublicApiController"), exports);
 __exportStar(require("./controller/gateway/StaticController"), exports);
+__exportStar(require("./controller/gateway/AsyncTaskController"), exports);
 __exportStar(require("./controller/helpers.controller"), exports);
 __exportStar(require("./controller/home.controller"), exports);
 __exportStar(require("./controller/manage/AnyApiMangeApi"), exports);
@@ -83,6 +84,8 @@ __exportStar(require("./service/curd/CurdMixService"), exports);
 __exportStar(require("./service/curd/CurdProService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiLoadService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskRunnerService"), exports);
 __exportStar(require("./models/userSession"), exports);
 __exportStar(require("./models/bizmodels"), exports);
 __exportStar(require("./models/SystemEntities"), exports);
@@ -90,6 +93,7 @@ __exportStar(require("./models/SystemPerm"), exports);
 __exportStar(require("./models/contextLogger"), exports);
 __exportStar(require("./models/devops"), exports);
 __exportStar(require("./models/SystemTables"), exports);
+__exportStar(require("./models/AsyncTaskModel"), exports);
 __exportStar(require("./libs/utils/common-dto"), exports);
 __exportStar(require("./libs/utils/crypto-utils"), exports);
 __exportStar(require("./libs/utils/fatcms-request"), exports);

package/dist/models/AsyncTaskModel.d.ts

@@ -4,14 +4,14 @@ export interface SysAsyncTaskEntity {
     task_name: string;
     task_description: string | null;
     task_type: string;
-    task_status: TaskStatus;
+    task_status: SysAsyncTaskStatus;
     input_params: any;
     output_result: any | null;
     input_file_path: string | null;
-    input_file_format: FileFormat | null;
+    input_file_format: SysAsyncFileFormat | null;
     input_file_size: number | null;
     output_file_path: string | null;
-    output_file_format: FileFormat | null;
+    output_file_format: SysAsyncFileFormat | null;
     output_file_size: number | null;
     input_total_records: number | null;
     output_total_records: number | null;
@@ -30,7 +30,7 @@ export interface SysAsyncTaskEntity {
     updated_at: Date;
     expired_at: Date | null;
 }
-export declare enum TaskStatus {
+export declare enum SysAsyncTaskStatus {
     PENDING = "PENDING",
     RUNNING = "RUNNING",
     SUCCEEDED = "SUCCEEDED",
@@ -38,7 +38,7 @@ export declare enum TaskStatus {
     CANCELLED = "CANCELLED",
     PAUSED = "PAUSED"
 }
-export declare enum FileFormat {
+export declare enum SysAsyncFileFormat {
     XLSX = "xlsx",
     CSV = "csv",
     JSON = "json",
@@ -50,15 +50,15 @@ export declare enum FileFormat {
     PNG = "png",
     JPG = "jpg"
 }
-export interface ITaskHandler {
-    execute(ctx: TaskContext): Promise<void>;
+export interface ISysAsyncTaskHandler {
+    execute(ctx: SysAsyncTaskContext): Promise<void>;
 }
-export interface TaskContext {
+export interface SysAsyncTaskContext {
     task: SysAsyncTaskEntity;
 }
-export interface TaskHandlerConfig {
+export interface SysAsyncTaskHandlerConfig {
     taskType: string;
-    handler: ITaskHandler;
+    handler: ISysAsyncTaskHandler;
     maxRetries?: number;
     priority?: number;
     expireSeconds?: number;

package/dist/models/AsyncTaskModel.js

@@ -1,25 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileFormat = exports.TaskStatus = void 0;
-var TaskStatus;
-(function (TaskStatus) {
-    TaskStatus["PENDING"] = "PENDING";
-    TaskStatus["RUNNING"] = "RUNNING";
-    TaskStatus["SUCCEEDED"] = "SUCCEEDED";
-    TaskStatus["FAILED"] = "FAILED";
-    TaskStatus["CANCELLED"] = "CANCELLED";
-    TaskStatus["PAUSED"] = "PAUSED";
-})(TaskStatus = exports.TaskStatus || (exports.TaskStatus = {}));
-var FileFormat;
-(function (FileFormat) {
-    FileFormat["XLSX"] = "xlsx";
-    FileFormat["CSV"] = "csv";
-    FileFormat["JSON"] = "json";
-    FileFormat["PDF"] = "pdf";
-    FileFormat["TXT"] = "txt";
-    FileFormat["XML"] = "xml";
-    FileFormat["ZIP"] = "zip";
-    FileFormat["HTML"] = "html";
-    FileFormat["PNG"] = "png";
-    FileFormat["JPG"] = "jpg";
-})(FileFormat = exports.FileFormat || (exports.FileFormat = {}));
+exports.SysAsyncFileFormat = exports.SysAsyncTaskStatus = void 0;
+var SysAsyncTaskStatus;
+(function (SysAsyncTaskStatus) {
+    SysAsyncTaskStatus["PENDING"] = "PENDING";
+    SysAsyncTaskStatus["RUNNING"] = "RUNNING";
+    SysAsyncTaskStatus["SUCCEEDED"] = "SUCCEEDED";
+    SysAsyncTaskStatus["FAILED"] = "FAILED";
+    SysAsyncTaskStatus["CANCELLED"] = "CANCELLED";
+    SysAsyncTaskStatus["PAUSED"] = "PAUSED";
+})(SysAsyncTaskStatus = exports.SysAsyncTaskStatus || (exports.SysAsyncTaskStatus = {}));
+var SysAsyncFileFormat;
+(function (SysAsyncFileFormat) {
+    SysAsyncFileFormat["XLSX"] = "xlsx";
+    SysAsyncFileFormat["CSV"] = "csv";
+    SysAsyncFileFormat["JSON"] = "json";
+    SysAsyncFileFormat["PDF"] = "pdf";
+    SysAsyncFileFormat["TXT"] = "txt";
+    SysAsyncFileFormat["XML"] = "xml";
+    SysAsyncFileFormat["ZIP"] = "zip";
+    SysAsyncFileFormat["HTML"] = "html";
+    SysAsyncFileFormat["PNG"] = "png";
+    SysAsyncFileFormat["JPG"] = "jpg";
+})(SysAsyncFileFormat = exports.SysAsyncFileFormat || (exports.SysAsyncFileFormat = {}));

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -32,10 +32,10 @@ class AsyncTaskRunner {
             const taskElement = taskList[i];
             try {
                 await this.executeTask(taskElement);
-                taskElement.task_status = AsyncTaskModel_1.TaskStatus.SUCCEEDED;
+                taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED;
             }
             catch (error) {
-                taskElement.task_status = AsyncTaskModel_1.TaskStatus.FAILED;
+                taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.FAILED;
                 taskElement.error_message = (0, errorToString_1.errorToString)(error);
             }
         }
@@ -63,7 +63,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const queryRes = await this.curdProService.executeCrudByCfg({
             condition: {
-                task_status: AsyncTaskModel_1.TaskStatus.PENDING
+                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.PENDING
             },
             limit: 10
         }, {
@@ -84,7 +84,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
                 }
             },
             data: {
-                task_status: AsyncTaskModel_1.TaskStatus.RUNNING
+                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING
             }
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_async_tasks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.13",
+  "version": "0.0.1-beta.14",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/gateway/AsyncTaskController.ts

@@ -3,7 +3,7 @@ import { Controller, Inject, Get, Post, Query } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
 import {AsyncTaskService} from "@/service/asyncTask/AsyncTaskService";
-import {SysAsyncTaskEntity, TaskStatus} from "@/models/AsyncTaskModel";
+import {SysAsyncTaskEntity, SysAsyncTaskStatus} from "@/models/AsyncTaskModel";
 import {KeysOfSimpleSQL} from "@/libs/crud-pro/models/keys";
 import {SystemTables} from "@/models/SystemTables";
 import {CommonException} from "@/libs/crud-pro/exceptions";
@@ -21,7 +21,7 @@ function fixCancelBodyData(body:any, id: number) {
 
   // fix data
   const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
-  dataObj.task_status = TaskStatus.CANCELLED;
+  dataObj.task_status = SysAsyncTaskStatus.CANCELLED;
   body.data = dataObj;
 }
 
@@ -33,7 +33,7 @@ function fixCreateBodyData(body:any) {
 
   // fix data
   const dataObj: SysAsyncTaskEntity = (body.data || {}) as any;
-  dataObj.task_status = TaskStatus.PENDING;
+  dataObj.task_status = SysAsyncTaskStatus.PENDING;
 }
 
 

package/src/index.ts

@@ -8,6 +8,7 @@ export * from './controller/gateway/FileController';
 export * from './controller/gateway/ProxyApiGatewayController';
 export * from './controller/gateway/PublicApiController';
 export * from './controller/gateway/StaticController';
+export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
@@ -65,6 +66,8 @@ export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './service/asyncTask/AsyncTaskService';
+export * from './service/asyncTask/AsyncTaskRunnerService';
 export * from './models/userSession';
 export * from './models/bizmodels';
 export * from './models/SystemEntities';
@@ -72,6 +75,7 @@ export * from './models/SystemPerm';
 export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
+export * from './models/AsyncTaskModel';
 
 
 export * from './libs/utils/common-dto';

package/src/models/AsyncTaskModel.ts

@@ -4,16 +4,16 @@ export interface SysAsyncTaskEntity {
   task_name: string;
   task_description: string | null;
   task_type: string;
-  task_status: TaskStatus;
+  task_status: SysAsyncTaskStatus;
   input_params: any;
   output_result: any | null;
 
   input_file_path: string | null;
-  input_file_format: FileFormat | null;
+  input_file_format: SysAsyncFileFormat | null;
   input_file_size: number | null;
 
   output_file_path: string | null;
-  output_file_format: FileFormat | null;
+  output_file_format: SysAsyncFileFormat | null;
   output_file_size: number | null;
 
   input_total_records: number | null;
@@ -34,7 +34,7 @@ export interface SysAsyncTaskEntity {
   expired_at: Date | null;
 }
 
-export enum TaskStatus {
+export enum SysAsyncTaskStatus {
   PENDING = 'PENDING', // 等待中，还未进入排队
   RUNNING = 'RUNNING', // 运行中
   SUCCEEDED = 'SUCCEEDED',
@@ -43,7 +43,7 @@ export enum TaskStatus {
   PAUSED = 'PAUSED', // 暂停
 }
 
-export enum FileFormat {
+export enum SysAsyncFileFormat {
   XLSX = 'xlsx',
   CSV = 'csv',
   JSON = 'json',
@@ -57,17 +57,17 @@ export enum FileFormat {
 }
 
 
-export interface ITaskHandler {
-  execute(ctx: TaskContext): Promise<void>;
+export interface ISysAsyncTaskHandler {
+  execute(ctx: SysAsyncTaskContext): Promise<void>;
 }
 
-export interface TaskContext {
+export interface SysAsyncTaskContext {
   task: SysAsyncTaskEntity;
 }
 
-export interface TaskHandlerConfig {
+export interface SysAsyncTaskHandlerConfig {
   taskType: string;
-  handler: ITaskHandler;
+  handler: ISysAsyncTaskHandler;
   maxRetries?: number;
   priority?: number;
   expireSeconds?: number;

package/src/service/asyncTask/AsyncTaskRunnerService.ts

@@ -3,7 +3,7 @@ import {Context} from '@midwayjs/koa';
 import {BaseService} from "@/service/base/BaseService";
 import {IScheduleService} from "@/interface";
 import {CurdProService} from "@/service/curd/CurdProService";
-import {ITaskHandler, SysAsyncTaskEntity, TaskStatus} from "@/models/AsyncTaskModel";
+import {ISysAsyncTaskHandler, SysAsyncTaskEntity, SysAsyncTaskStatus} from "@/models/AsyncTaskModel";
 import {GLOBAL_STATIC_CONFIG} from "@/libs/global-config/global-config";
 import {SystemTables} from "@/models/SystemTables";
 import {KeysOfSimpleSQL} from "@/libs/crud-pro/models/keys";
@@ -12,7 +12,7 @@ import {errorToString} from "@/libs/utils/errorToString";
 
 class AsyncTaskRunner  {
   isBusy: boolean = false;
-  taskHandlerMap: Map<string, ITaskHandler> = new Map();
+  taskHandlerMap: Map<string, ISysAsyncTaskHandler> = new Map();
 
   async executeTaskList(taskList: SysAsyncTaskEntity[]) {
     if (!taskList || taskList.length === 0) {
@@ -24,9 +24,9 @@ class AsyncTaskRunner  {
       const taskElement = taskList[i];
       try {
         await this.executeTask(taskElement);
-        taskElement.task_status = TaskStatus.SUCCEEDED;
+        taskElement.task_status = SysAsyncTaskStatus.SUCCEEDED;
       } catch (error) {
-        taskElement.task_status = TaskStatus.FAILED;
+        taskElement.task_status = SysAsyncTaskStatus.FAILED;
         taskElement.error_message = errorToString(error)
       }
     }
@@ -73,7 +73,7 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
 
     const queryRes = await this.curdProService.executeCrudByCfg({
       condition: {
-        task_status: TaskStatus.PENDING
+        task_status: SysAsyncTaskStatus.PENDING
       },
       limit: 10
     },{
@@ -98,7 +98,7 @@ export class AsyncTaskRunnerService extends BaseService implements IScheduleServ
         }
       },
       data: {
-        task_status: TaskStatus.RUNNING
+        task_status: SysAsyncTaskStatus.RUNNING
       }
     },{
       sqlTable: SystemTables.sys_async_tasks,