midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.22

package/dist/service/WorkbenchService.js

@@ -20,6 +20,7 @@ const exceptions_1 = require("../libs/crud-pro/exceptions");
 const functions_1 = require("../libs/utils/functions");
 const fatcms_request_1 = require("../libs/utils/fatcms-request");
 const MixinUtils_1 = require("../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../libs/global-config/global-config");
 //
 // const lruCache = new LRUCache<string, any>({
 //   max: 500,
@@ -38,14 +39,15 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
         await this.getAllWorkbenchInfoMap(true);
     }
     async getAllWorkbenchInfoList(isForceRefresh) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         let listData = lruCache.get(CACHE_KEY_WORKBENCH_LIST);
         if (!listData || isForceRefresh === true) {
             const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };
             const res = await this.curdProService.executeCrudByCfg(reqJson, {
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
             });
             listData = res.getResRows();
             lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);

package/dist/service/anyapi/AnyApiService.js

@@ -23,6 +23,7 @@ const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const WorkbenchService_1 = require("../WorkbenchService");
 const ValidateUtils_1 = require("../../libs/crud-pro/utils/ValidateUtils");
 const ApiBaseService_1 = require("../base/ApiBaseService");
+const global_config_1 = require("../../libs/global-config/global-config");
 const lruCache = new lru_cache_1.LRUCache({
     max: 500,
     ttl: 1000 * 60,
@@ -65,12 +66,13 @@ let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService
         return anyApi;
     }
     async _getAnyApiMethod(methodCode) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({ condition: { method: methodCode } }, {
             sqlTable: SystemTables_1.SystemTables.sys_anyapi,
             method: `get_sys_anyapi_${methodCode}`,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             updateCfg: {},
         });
         const obj = res.getOneObj();

package/dist/service/asyncTask/AsyncTaskRunnerService.d.ts

@@ -0,0 +1,37 @@
+import { Context } from '@midwayjs/koa';
+import { BaseService } from '../../service/base/BaseService';
+import { IScheduleService } from '../../interface';
+import { ISysAsyncTaskHandler, SysAsyncTaskEntity } from '../../models/AsyncTaskModel';
+declare class AsyncTaskRunner {
+    isBusy: boolean;
+    taskHandlerMap: Map<string, ISysAsyncTaskHandler>;
+    executeTaskList(taskList: SysAsyncTaskEntity[]): Promise<void>;
+    private executeTask;
+    /**
+     * 更新任务状态或任务进度
+     * @param taskElement
+     * @param updatePartials
+     * @private
+     */
+    private updateTaskStatus;
+    /**
+     * 获取当前进程可以处理的任务类型。
+     */
+    getHandlerTaskTypeList(): string[];
+}
+/**
+ * 业务可以扩展
+ */
+export declare const ASYNC_TASK_RUNNER: AsyncTaskRunner;
+export declare class AsyncTaskRunnerService extends BaseService implements IScheduleService {
+    protected ctx: Context;
+    private curdProService;
+    fetchPendingTasks(): Promise<void>;
+    runBySchedule(): Promise<void>;
+    /**
+     * 是否存在新任务
+     * @private
+     */
+    private isExistNewTask;
+}
+export {};

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -0,0 +1,232 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncTaskRunnerService = exports.ASYNC_TASK_RUNNER = void 0;
+const core_1 = require("@midwayjs/core");
+const BaseService_1 = require("../../service/base/BaseService");
+const CurdProService_1 = require("../../service/curd/CurdProService");
+const AsyncTaskModel_1 = require("../../models/AsyncTaskModel");
+const global_config_1 = require("../../libs/global-config/global-config");
+const SystemTables_1 = require("../../models/SystemTables");
+const keys_1 = require("../../libs/crud-pro/models/keys");
+const errorToString_1 = require("../../libs/utils/errorToString");
+const schedule_1 = require("../../schedule");
+const RedisKeys_1 = require("../../models/RedisKeys");
+const END_STATUS_LIST = [
+    AsyncTaskModel_1.SysAsyncTaskStatus.PART_SUCCEEDED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.FAILED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.CANCELLED,
+    AsyncTaskModel_1.SysAsyncTaskStatus.PAUSED,
+];
+class AsyncTaskRunner {
+    constructor() {
+        this.isBusy = false;
+        this.taskHandlerMap = new Map();
+    }
+    async executeTaskList(taskList) {
+        if (!taskList || taskList.length === 0) {
+            return;
+        }
+        this.isBusy = true;
+        for (let i = 0; i < taskList.length; i++) {
+            const taskElement = taskList[i];
+            taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING;
+            try {
+                // 任务状态的设置在自定义的执行器里面。
+                await this.executeTask(taskElement);
+                // 当前不是终止状态，并且没有异常就设置成成功。
+                if (!END_STATUS_LIST.includes(taskElement.task_status)) {
+                    taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.SUCCEEDED;
+                }
+            }
+            catch (error) {
+                taskElement.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.FAILED;
+                taskElement.error_message = (0, errorToString_1.errorToString)(error);
+            }
+            try {
+                await this.updateTaskStatus(taskElement, {
+                    task_status: taskElement.task_status,
+                    error_message: taskElement.error_message,
+                });
+            }
+            catch (error) {
+                schedule_1.ANONYMOUS_CONTEXT.getApp().getCoreLogger().error('executeTaskList error', error);
+            }
+        }
+        this.isBusy = false;
+    }
+    async executeTask(taskElement) {
+        const taskType = taskElement.task_type;
+        const taskHandler = this.taskHandlerMap.get(taskType);
+        if (!taskHandler) {
+            throw new Error('TaskHandler not found , taskType = ' + taskType);
+        }
+        const updateTaskStatus = (updatePartials) => {
+            return this.updateTaskStatus(taskElement, updatePartials);
+        };
+        await taskHandler.execute({ task: taskElement, updateTaskStatus });
+    }
+    /**
+     * 更新任务状态或任务进度
+     * @param taskElement
+     * @param updatePartials
+     * @private
+     */
+    async updateTaskStatus(taskElement, updatePartials) {
+        if (!updatePartials) {
+            throw new Error('updatePartials not found');
+        }
+        return await schedule_1.ANONYMOUS_CONTEXT.runServiceAtAnonymousContext(async (ctx) => {
+            const curdProService = await ctx.requestContext.getAsync('curdProService');
+            const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+            const res = await curdProService.executeCrudByCfg({
+                condition: {
+                    id: taskElement.id,
+                },
+                data: updatePartials,
+            }, {
+                sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
+                sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
+            });
+            return res.getResModel().affected;
+        });
+    }
+    /**
+     * 获取当前进程可以处理的任务类型。
+     */
+    getHandlerTaskTypeList() {
+        const keys = this.taskHandlerMap.keys();
+        return [...keys];
+    }
+}
+/**
+ * 业务可以扩展
+ */
+exports.ASYNC_TASK_RUNNER = new AsyncTaskRunner();
+/**
+ * Redis锁
+ */
+const ASYNC_TASK_LOCK = RedisKeys_1.RedisKeys.ASYNC_TASK_LOCK;
+const ASYNC_TASK_RUNTIME_OBJ = {
+    LAST_CHECK_ASYNC_TASK_UPDATE_TIME: 0,
+};
+let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.BaseService {
+    async fetchPendingTasks() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        // 只获取本进程能够处理的任务类型。
+        const taskTypeList = exports.ASYNC_TASK_RUNNER.getHandlerTaskTypeList();
+        if (taskTypeList.length === 0) {
+            return Promise.resolve();
+        }
+        // 查询等待处理的任务。
+        const queryRes = await this.curdProService.executeCrudByCfg({
+            condition: {
+                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.PENDING,
+                task_type: {
+                    $in: taskTypeList,
+                },
+            },
+            orderBy: 'id+',
+            limit: 10,
+        }, {
+            sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        const taskList = queryRes.getResRows();
+        if (taskList.length === 0) {
+            return Promise.resolve();
+        }
+        const taskIds = taskList.map(elem => elem.id).filter(Boolean);
+        // 将状态更新为处理中。防止其它进程重复处理。
+        await this.curdProService.executeCrudByCfg({
+            condition: {
+                id: {
+                    $in: taskIds,
+                },
+            },
+            data: {
+                task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING,
+            },
+        }, {
+            sqlTable: SystemTables_1.SystemTables.sys_async_tasks,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        });
+        // 开始执行。
+        exports.ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
+            console.log('ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
+        });
+    }
+    async runBySchedule() {
+        // 1. 当前很忙
+        if (exports.ASYNC_TASK_RUNNER.isBusy) {
+            return Promise.resolve();
+        }
+        // 2. 发现了新任务
+        const isExistNewTask = await this.isExistNewTask();
+        if (!isExistNewTask) {
+            return Promise.resolve();
+        }
+        // 这里的过期时间1分钟即可。fetchPendingTasks函数不可能超过一分钟。
+        // 因为这里只是从数据库中获取一批任务，放到自己的任务队列里。还没触发执行。
+        const lock = await this.redisService.set(ASYNC_TASK_LOCK, 1, 'EX', 60, 'NX');
+        if (lock !== 'OK') {
+            return Promise.resolve();
+        }
+        try {
+            await this.fetchPendingTasks();
+        }
+        catch (e) {
+            console.error('fetchPendingTasks error', (0, errorToString_1.errorToString)(e));
+        }
+        await this.redisService.del(ASYNC_TASK_LOCK);
+        return Promise.resolve();
+    }
+    /**
+     * 是否存在新任务
+     * @private
+     */
+    async isExistNewTask() {
+        // 刚启动，没有检查过。
+        if (!ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME) {
+            ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = Date.now();
+            return true;
+        }
+        //Redis没有任何内容
+        const updateTime = await this.redisService.get(RedisKeys_1.RedisKeys.ASYNC_TASK_UPDATE_TIME);
+        if (!updateTime) {
+            ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = Date.now();
+            return false;
+        }
+        const updateTimeNumber = Number.parseInt(updateTime, 10);
+        const isExistNewTask = updateTimeNumber > ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME;
+        ASYNC_TASK_RUNTIME_OBJ.LAST_CHECK_ASYNC_TASK_UPDATE_TIME = updateTimeNumber;
+        return isExistNewTask;
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], AsyncTaskRunnerService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdProService_1.CurdProService)
+], AsyncTaskRunnerService.prototype, "curdProService", void 0);
+AsyncTaskRunnerService = __decorate([
+    (0, core_1.Provide)()
+], AsyncTaskRunnerService);
+exports.AsyncTaskRunnerService = AsyncTaskRunnerService;

package/dist/service/asyncTask/AsyncTaskService.d.ts

@@ -0,0 +1,7 @@
+import { Context } from '@midwayjs/koa';
+import { BaseService } from '../../service/base/BaseService';
+export declare class AsyncTaskService extends BaseService {
+    protected ctx: Context;
+    startTask(): Promise<void>;
+    cancelTask(id: number): Promise<void>;
+}

package/dist/service/asyncTask/AsyncTaskService.js

@@ -0,0 +1,34 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncTaskService = void 0;
+const core_1 = require("@midwayjs/core");
+const BaseService_1 = require("../../service/base/BaseService");
+const schedule_1 = require("../../schedule");
+const scheduleNames_1 = require("../../schedule/scheduleNames");
+const RedisKeys_1 = require("../../models/RedisKeys");
+let AsyncTaskService = class AsyncTaskService extends BaseService_1.BaseService {
+    async startTask() {
+        await this.redisService.set(RedisKeys_1.RedisKeys.ASYNC_TASK_UPDATE_TIME, `${Date.now()}`);
+        (0, schedule_1.runScheduleTaskOnce)(scheduleNames_1.INNER_SCHEDULE_NAMES.asyncTaskRunnerService).then(schedule => {
+            console.log(schedule);
+        });
+    }
+    async cancelTask(id) { }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], AsyncTaskService.prototype, "ctx", void 0);
+AsyncTaskService = __decorate([
+    (0, core_1.Provide)()
+], AsyncTaskService);
+exports.AsyncTaskService = AsyncTaskService;

package/dist/service/crudstd/CrudStdService.d.ts

@@ -19,7 +19,7 @@ export declare class CrudStdService extends ApiBaseService {
     /**
      * 执行普通CRUD
      */
-    executeStdQuery(appCode: string, settingKey: string, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<ExecuteContext>;
+    executeStdQuery(appCode: string, settingKey: string, params: IRequestModel, sqlSimpleName: KeysOfSimpleSQL): Promise<any>;
     /**
      * 获取appInfo 并且拿到当前settingKey相关的信息
      * @param appCode
@@ -47,4 +47,5 @@ export declare class CrudStdService extends ApiBaseService {
      */
     getParsedCrudStdAppInfo(appCode: string): Promise<ICrudStdAppInfo>;
     private hasOperationPerm;
+    private fixDataFieldTypeBySqlTableField;
 }

package/dist/service/crudstd/CrudStdService.js

@@ -21,6 +21,8 @@ const CrudStdRelationService_1 = require("./CrudStdRelationService");
 const _ = require("lodash");
 const ApiBaseService_1 = require("../base/ApiBaseService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
+const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
@@ -35,11 +37,25 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         if (!appInfo || appInfo.status !== 1) {
             throw new devops_1.BizException('应用不存在或已下线：' + appCode);
         }
+        // 查询列表功能
+        if (settingKey === exports.SPECIAL_SETTING_KEY.QUERY_LIST) {
+            // 正确启用了自定义查询功能
+            const customQueryApi = _.get(stdCrudCfgObj, 'othersSetting.values.customQueryApi');
+            if (typeof customQueryApi === 'string') {
+                const customQueryApiArr = customQueryApi.split('.');
+                const serviceName = customQueryApiArr[0] || "";
+                const serviceFunc = customQueryApiArr[1] || "";
+                if (serviceName.endsWith('Service')) {
+                    const serviceObj = await this.ctx.requestContext.getAsync(serviceName);
+                    return serviceObj[serviceFunc](params);
+                }
+            }
+        }
         const databaseName = stdCrudCfgObj.tableBaseInfo.databaseName;
         const { dbType, dbName } = (0, DatabaseName_1.parseDatabaseName)(databaseName);
         const cfgModel = {
             sqlDatabase: dbName,
-            sqlDdType: dbType,
+            sqlDbType: dbType,
             sqlTable: stdCrudCfgObj.tableBaseInfo.tableName,
             sqlSimpleName,
         };
@@ -53,6 +69,10 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+        // 根据表结构的数据类型，修正数据类型
+        await this.fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, { dbType, dbName });
+        // 业务系统自定义的修改cfgModel
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
         return await this.curdMixService.executeCrudByCfg(params, cfgModel);
     }
     /**
@@ -112,12 +132,13 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * @private
      */
     async getCrudStdAppInfo(appCode) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         this.logInfo('getCrudStdAppInfo', appCode);
         const ss = {
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
     }
@@ -159,6 +180,30 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         return true; // 无需鉴权
     }
+    async fixDataFieldTypeBySqlTableField(params, cfgModel, appInfo, arg3) {
+        const tableFields = _.get(appInfo, 'stdCrudCfgObj.tableFields');
+        const tableFieldMap = MixinUtils_1.MixinUtils.toMap(tableFields, (e) => {
+            return e.fieldIndex;
+        });
+        if (arg3.dbType === keys_1.SqlDbType.postgres) {
+            if (cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT || cfgModel.sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
+                const data = params.data || {};
+                const dataKeys = Object.keys(data);
+                for (let index = 0; index < dataKeys.length; index++) {
+                    const dataKey = dataKeys[index];
+                    const dataValue = data[dataKey];
+                    const fieldInfo = tableFieldMap[dataKey];
+                    const fieldType = ('' + _.get(fieldInfo, 'type')).toUpperCase();
+                    if (fieldType === 'ARRAY') {
+                        const dataValueArray = (0, functions_1.parseJsonObject)(dataValue);
+                        if (Array.isArray(dataValueArray)) {
+                            data[dataKey] = `{${dataValueArray.map(v => `"${v}"`).join(',')}}`;
+                        }
+                    }
+                }
+            }
+        }
+    }
 };
 __decorate([
     (0, core_1.Inject)(),

package/dist/service/curd/CrudProQuick.d.ts

@@ -0,0 +1,24 @@
+import { SqlDbType } from "../../libs/crud-pro/models/keys";
+import { IRequestModel } from "../../libs/crud-pro/interfaces";
+import { IRequestCfgModel2 } from "../../models/bizmodels";
+import { CrudPro } from "../../libs/crud-pro/CrudPro";
+import { ResModelAffected, ResModelStandard } from "../../libs/crud-pro/models/ResModel";
+export declare class CrudProQuick {
+    private readonly curdPro;
+    private readonly sqlDbType;
+    private readonly sqlDatabase;
+    private readonly sqlTable?;
+    private baseCfgModel;
+    constructor(curdPro: CrudPro, sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string);
+    setBaseCfgModel(baseCfgModel: IRequestCfgModel2): void;
+    private executeCrudByCfg;
+    getOne(reqJson: IRequestModel, sqlTable?: string): Promise<any>;
+    getList(reqJson: IRequestModel, sqlTable?: string): Promise<any[]>;
+    getListPage(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
+    getTotalCount(reqJson: IRequestModel, sqlTable?: string): Promise<number>;
+    insertObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
+    updateObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
+    insertOrUpdate(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelStandard>;
+    deleteObject(reqJson: IRequestModel, sqlTable?: string): Promise<ResModelAffected>;
+    executeSQL(executeSql: string, args?: any[]): Promise<any>;
+}

package/dist/service/curd/CrudProQuick.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudProQuick = void 0;
+const keys_1 = require("../../libs/crud-pro/models/keys");
+class CrudProQuick {
+    constructor(curdPro, sqlDatabase, sqlDbType, sqlTable) {
+        this.baseCfgModel = {};
+        this.sqlDatabase = sqlDatabase;
+        this.sqlDbType = sqlDbType;
+        this.curdPro = curdPro;
+        this.sqlTable = sqlTable; // 全局sqlTable为空时，单独调用时就必须传sqlTable参数。
+    }
+    setBaseCfgModel(baseCfgModel) {
+        Object.assign(this.baseCfgModel, baseCfgModel);
+    }
+    async executeCrudByCfg(reqJson, cfgModel2) {
+        const cfgModel = { ...this.baseCfgModel };
+        Object.assign(cfgModel, cfgModel2);
+        cfgModel.method = 'CrudProQuickAnonymous';
+        cfgModel.updateCfg = {};
+        cfgModel.sqlDatabase = this.sqlDatabase;
+        cfgModel.sqlDbType = this.sqlDbType;
+        if (!cfgModel.sqlTable) {
+            cfgModel.sqlTable = this.sqlTable;
+        }
+        if (!cfgModel.sqlTable) {
+            throw new Error('[CrudProQuick] sqlTable not found');
+        }
+        return await this.curdPro.executeCrudByCfg(reqJson, cfgModel);
+    }
+    async getOne(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getOneObj();
+    }
+    async getList(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResRows();
+    }
+    async getListPage(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel(); // 因为它有2个返回值
+    }
+    async getTotalCount(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().total_count;
+    }
+    async insertObject(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().affected;
+    }
+    async updateObject(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().affected;
+    }
+    async insertOrUpdate(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel(); // 因为它有三个返回值
+    }
+    async deleteObject(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_DELETE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getResModel().affected;
+    }
+    async executeSQL(executeSql, args) {
+        const sqlCfgModel = {
+            executeSql: executeSql,
+            executeSqlArgs: args,
+            sqlDatabase: this.sqlDatabase,
+            sqlDbType: this.sqlDbType,
+        };
+        return await this.curdPro.executeSQL(sqlCfgModel);
+    }
+}
+exports.CrudProQuick = CrudProQuick;

package/dist/service/curd/CurdMixByAccountService.js

@@ -17,10 +17,12 @@ const CurdMixUtils_1 = require("./CurdMixUtils");
 const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../../libs/global-config/global-config");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.accountBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
 let CurdMixByAccountService = class CurdMixByAccountService {
     async handleExecuteContextPrepare(executeContext) {
+        const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const relations = dictMixUtils.pickColumnRelations(executeContext);
         if (!relations || relations.length === 0) {
             return;
@@ -28,9 +30,13 @@ let CurdMixByAccountService = class CurdMixByAccountService {
         const accountIds = new Set();
         dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
             const { sourceColumn } = columnRelation;
-            const accountId = _.get(row, sourceColumn);
-            if (accountId) {
-                accountIds.add(accountId);
+            if (sourceColumn) {
+                const accountId = _.get(row, sourceColumn);
+                if (accountId) {
+                    const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
+                    accountIds.add(fatcmsUserAccountId);
+                    row['__fatcmsUserAccountId__'] = fatcmsUserAccountId;
+                }
             }
         });
         if (accountIds.size === 0) {
@@ -40,8 +46,8 @@ let CurdMixByAccountService = class CurdMixByAccountService {
             method: 'UserAccountService.queryAccountBasicInfoByIds',
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
         };
         const reqJson = {
             columns: ['nick_name', 'avatar', 'account_id'],
@@ -69,7 +75,7 @@ let CurdMixByAccountService = class CurdMixByAccountService {
                     { from: 'avatar', to: `${sourceColumn}_user.avatar` },
                 ];
             }
-            dictMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+            dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
         });
     }
 };