midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.70

package/dist/service/curd/CrudProQuick.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudProQuick = void 0;
+const keys_1 = require("../../libs/crud-pro/models/keys");
+const DEFAULT_MAX_LIMIT = 10 * 10000;
+class CrudProQuick {
+    constructor(curdPro, sqlDatabase, sqlDbType, sqlTable) {
+        this.baseCfgModel = {
+            maxLimit: DEFAULT_MAX_LIMIT,
+        };
+        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);
+    }
+    /**
+     * 随便获取一个。不推荐使用。建议使用getUniqueOne。
+     * @deprecated
+     * @param reqJson
+     * @param sqlTable
+     * @returns 返回一条数据对象
+     */
+    async getOne(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
+        };
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        return res.getOneObj();
+    }
+    /**
+     * 期望获取唯一的一个对象，如果数据库中的数量不唯一，则报错。
+     * @param reqJson
+     * @param sqlTable
+     * @returns 返回一条数据对象
+     */
+    async getUniqueOne(reqJson, sqlTable) {
+        const cfgModel = {
+            sqlTable,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE,
+        };
+        reqJson.pageNo = 1;
+        reqJson.pageSize = 1;
+        const res = await this.executeCrudByCfg(reqJson, cfgModel);
+        const resModel = res.getResModel();
+        const total_count = resModel.total_count;
+        const rows = resModel.rows;
+        if (total_count === 0) {
+            return null;
+        }
+        if (total_count > 1) {
+            throw new Error(`[CrudProQuick][getUniqueOne] only one object is required, but got ${total_count}`);
+        }
+        return rows[0];
+    }
+    /**
+     * 获取数据列表
+     * @param reqJson
+     * @param sqlTable 数据库表名称
+     * @returns 返回多条数据对象组成的数组
+     */
+    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,
+            maxLimit: this.baseCfgModel.maxLimit || DEFAULT_MAX_LIMIT,
+        };
+        return await this.curdPro.executeSQL(sqlCfgModel);
+    }
+    /**
+     * 执行数据库的原生SQL语句，不做任何封装的SQL
+     * @param executeNativeSql
+     * @param args
+     */
+    async executeNativeSQL(executeNativeSql, args) {
+        const sqlCfgModel = {
+            isNativeSQL: true,
+            executeSql: executeNativeSql,
+            executeSqlArgs: args,
+            sqlDatabase: this.sqlDatabase,
+            sqlDbType: this.sqlDbType,
+            maxLimit: this.baseCfgModel.maxLimit || DEFAULT_MAX_LIMIT,
+        };
+        return await this.curdPro.executeSQL(sqlCfgModel);
+    }
+}
+exports.CrudProQuick = CrudProQuick;

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

@@ -1,9 +1,13 @@
-import { Context } from '@midwayjs/koa';
-import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-export declare class CurdMixByAccountService implements IExecuteContextHandler {
-    ctx: Context;
-    protected curdProService: CurdProService;
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
-}
+import { Context } from '@midwayjs/koa';
+import { CurdProService } from './CurdProService';
+import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+export declare class CurdMixByAccountService implements IExecuteContextHandler {
+    protected ctx: Context;
+    protected curdProService: CurdProService;
+    private cacheServiceFactory;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    private getFromCache;
+    private setToCache;
+    private queryUserAccountIdList;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
+}

package/dist/service/curd/CurdMixByAccountService.js

@@ -1,89 +1,151 @@
-"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.CurdMixByAccountService = void 0;
-const core_1 = require("@midwayjs/core");
-const _ = require("lodash");
-const CurdProService_1 = require("./CurdProService");
-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 } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const relations = dictMixUtils.pickColumnRelations(executeContext);
-        if (!relations || relations.length === 0) {
-            return;
-        }
-        const accountIds = new Set();
-        dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
-            const { sourceColumn } = columnRelation;
-            const accountId = _.get(row, sourceColumn);
-            if (accountId) {
-                accountIds.add(accountId);
-            }
-        });
-        if (accountIds.size === 0) {
-            return;
-        }
-        const cfgModel = {
-            method: 'UserAccountService.queryAccountBasicInfoByIds',
-            sqlTable: SystemTables_1.SystemTables.sys_user_account,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemDbName,
-            sqlDdType: SystemDbType,
-        };
-        const reqJson = {
-            columns: ['nick_name', 'avatar', 'account_id'],
-            condition: {
-                account_id: {
-                    $in: [...accountIds],
-                },
-            },
-        };
-        const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-        const userInfos = res.getResRows();
-        executeContext[TMP_CTX_KEY] = MixinUtils_1.MixinUtils.toNewMap(userInfos, (obj) => obj.account_id);
-    }
-    async handleExecuteContext(executeContext) {
-        const userInfoMap = executeContext[TMP_CTX_KEY];
-        if (!userInfoMap || userInfoMap.size === 0) {
-            return;
-        }
-        dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
-            const sourceColumn = columnRelation.sourceColumn;
-            const targetColumns = columnRelation.targetColumns;
-            if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
-                columnRelation.targetColumns = [
-                    { from: 'nick_name', to: `${sourceColumn}_user.nick_name` },
-                    { from: 'avatar', to: `${sourceColumn}_user.avatar` },
-                ];
-            }
-            dictMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
-        });
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], CurdMixByAccountService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], CurdMixByAccountService.prototype, "curdProService", void 0);
-CurdMixByAccountService = __decorate([
-    (0, core_1.Provide)()
-], CurdMixByAccountService);
-exports.CurdMixByAccountService = CurdMixByAccountService;
+"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.CurdMixByAccountService = void 0;
+const core_1 = require("@midwayjs/core");
+const _ = require("lodash");
+const CurdProService_1 = require("./CurdProService");
+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 bizmodels_1 = require("../../models/bizmodels");
+const CacheServiceFactory_1 = require("../../service/base/cache/CacheServiceFactory");
+const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.accountBasic);
+const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
+const TMP_CTX_KEY2 = _.uniqueId('CurdMixByAccountService2');
+let CurdMixByAccountService = class CurdMixByAccountService {
+    async handleExecuteContextPrepare(executeContext) {
+        const relations = dictMixUtils.pickColumnRelations(executeContext);
+        if (!relations || relations.length === 0) {
+            return;
+        }
+        const isArrayModeMap = new Map();
+        const accountIds = new Set();
+        dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
+            const { sourceColumn } = columnRelation;
+            if (sourceColumn) {
+                const accountId = _.get(row, sourceColumn);
+                if (accountId) {
+                    const { isArray, fatcmsUserAccountIdList, fatcmsUserAccountId } = (0, CurdMixUtils_1.toFatcmsUserAccountIdList)(accountId);
+                    if (isArray) {
+                        isArrayModeMap.set(sourceColumn, true);
+                        fatcmsUserAccountIdList.forEach(item => accountIds.add(item));
+                    }
+                    else if (fatcmsUserAccountId) {
+                        accountIds.add(fatcmsUserAccountId);
+                    }
+                }
+            }
+        });
+        if (accountIds.size === 0) {
+            return;
+        }
+        const userInfos = await this.queryUserAccountIdList([...accountIds]);
+        executeContext[TMP_CTX_KEY] = MixinUtils_1.MixinUtils.toNewMap(userInfos, (obj) => obj.account_id);
+        executeContext[TMP_CTX_KEY2] = isArrayModeMap;
+    }
+    async getFromCache(accountId) {
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByAccount);
+        return cacheService.getJsonObject(accountId);
+    }
+    async setToCache(accountId, value) {
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByAccount);
+        return cacheService.setJsonObject(accountId, value);
+    }
+    async queryUserAccountIdList(accountIds) {
+        const resultRowMap = {};
+        for (let i = 0; i < accountIds.length; i++) {
+            const accountId = accountIds[i];
+            const row = await this.getFromCache(accountId);
+            if (row) {
+                resultRowMap[accountId] = row;
+            }
+        }
+        const notCachedCodes = accountIds.filter((accountId) => !resultRowMap[accountId]);
+        if (notCachedCodes.length === 0) {
+            return Object.values(resultRowMap);
+        }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const reqJson = {
+            columns: ['nick_name', 'avatar', 'account_id'],
+            condition: {
+                account_id: {
+                    $in: [...notCachedCodes],
+                },
+            },
+        };
+        const cfgModel = {
+            method: 'UserAccountService.queryAccountBasicInfoByIds',
+            sqlTable: SystemTables_1.SystemTables.sys_user_account,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        };
+        const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
+        const rows = res.getResRows();
+        if (Array.isArray(rows) && rows.length > 0) {
+            for (let i = 0; i < rows.length; i++) {
+                const row = rows[i];
+                const { account_id } = row;
+                await this.setToCache(account_id, row);
+                resultRowMap[account_id] = row;
+            }
+        }
+        return Object.values(resultRowMap);
+    }
+    async handleExecuteContext(executeContext) {
+        const userInfoMap = executeContext[TMP_CTX_KEY];
+        const isArrayModeMap = executeContext[TMP_CTX_KEY2];
+        if (!userInfoMap || userInfoMap.size === 0) {
+            return;
+        }
+        dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
+            const sourceColumn = columnRelation.sourceColumn;
+            const targetColumns = columnRelation.targetColumns;
+            if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
+                const isArrayMode = isArrayModeMap.get(sourceColumn) || false;
+                if (isArrayMode === true) {
+                    columnRelation.targetColumns = [
+                        { from: 'nick_name', to: `${sourceColumn}_array_info[$ARRAY_INDEX].nick_name` },
+                        { from: 'avatar', to: `${sourceColumn}_array_info[$ARRAY_INDEX].avatar` },
+                        { from: 'account_id', to: `${sourceColumn}_array_info[$ARRAY_INDEX].account_id` },
+                    ];
+                }
+                else {
+                    columnRelation.targetColumns = [
+                        { from: 'nick_name', to: `${sourceColumn}_user.nick_name` },
+                        { from: 'avatar', to: `${sourceColumn}_user.avatar` },
+                        { from: 'account_id', to: `${sourceColumn}_user.account_id` },
+                    ];
+                }
+            }
+            dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
+        });
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], CurdMixByAccountService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdProService_1.CurdProService)
+], CurdMixByAccountService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], CurdMixByAccountService.prototype, "cacheServiceFactory", void 0);
+CurdMixByAccountService = __decorate([
+    (0, core_1.Provide)()
+], CurdMixByAccountService);
+exports.CurdMixByAccountService = CurdMixByAccountService;

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

@@ -1,13 +1,12 @@
-import { Context } from '@midwayjs/koa';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RedisCacheService } from "../base/RedisCacheService";
-export declare class CurdMixByDictService implements IExecuteContextHandler {
-    ctx: Context;
-    private curdProService;
-    protected redisCacheService: RedisCacheService;
-    private getFromCache;
-    private setToCache;
-    handleExecuteContextPrepare(executeContext: ExecuteContext): Promise<void>;
-    private getDictItemRows;
-    handleExecuteContext(executeContext: ExecuteContext): Promise<void>;
-}
+import { Context } from '@midwayjs/koa';
+import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+export declare class CurdMixByDictService implements IExecuteContextHandler {
+    ctx: Context;
+    private curdProService;
+    private cacheServiceFactory;
+    private getFromCache;
+    private setToCache;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    private getDictItemRows;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
+}