midway-fatcms 0.0.1-beta.65 → 0.0.1-beta.66

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

@@ -1,13 +1,12 @@
-import { Context } from '@midwayjs/koa';
-import { HandleExecuteContextType, 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: HandleExecuteContextType): Promise<void>;
-    private getDictItemRows;
-    handleExecuteContext(executeContext: HandleExecuteContextType): 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>;
+}

package/dist/service/curd/CurdMixByDictService.js

@@ -1,114 +1,118 @@
-"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.CurdMixByDictService = void 0;
-const _ = require("lodash");
-const core_1 = require("@midwayjs/core");
-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 MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
-const RedisCacheService_1 = require("../base/RedisCacheService");
-const global_config_1 = require("../../libs/global-config/global-config");
-const RedisKeys_1 = require("../../models/RedisKeys");
-const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
-const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
-let CurdMixByDictService = class CurdMixByDictService {
-    async getFromCache(code) {
-        const cacheKey = `${RedisKeys_1.RedisKeys.CURD_MIX_BY_DICT_PREFIX}${code}`;
-        return this.redisCacheService.getJsonObject(cacheKey);
-    }
-    async setToCache(code, value) {
-        const cacheKey = `${RedisKeys_1.RedisKeys.CURD_MIX_BY_DICT_PREFIX}${code}`;
-        return this.redisCacheService.setJsonObject(cacheKey, value, 60 * 60);
-    }
-    async handleExecuteContextPrepare(executeContext) {
-        const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
-        if (!codes || codes.length === 0) {
-            return;
-        }
-        const rows = await this.getDictItemRows(codes);
-        executeContext[TMP_CTX_KEY] = new MultiKeyMap_1.MultiKeyMap(rows, 'dict_code', 'value');
-    }
-    async getDictItemRows(codes) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const noCacheCodes = [];
-        // 从缓存里面取
-        let cachedRows = [];
-        for (let i = 0; i < codes.length; i++) {
-            const code = codes[i];
-            const rows1 = await this.getFromCache(code);
-            // const rows1 = [];
-            if (rows1 && rows1.length > 0) {
-                cachedRows = cachedRows.concat(rows1);
-            }
-            else {
-                noCacheCodes.push(code);
-            }
-        }
-        // 从数据库里面取
-        let selectedRows = [];
-        if (noCacheCodes.length > 0) {
-            const res1 = await this.curdProService.executeCrudByCfg({
-                condition: { dict_code: { $in: noCacheCodes } },
-            }, {
-                sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
-                sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemDbName,
-                sqlDbType: SystemDbType,
-            });
-            selectedRows = res1.getResRows();
-            //放到缓存里
-            for (let i = 0; i < noCacheCodes.length; i++) {
-                const noCacheCode = noCacheCodes[i];
-                const rows1 = selectedRows.filter(e => e.dict_code === noCacheCode);
-                await this.setToCache(noCacheCode, rows1);
-            }
-        }
-        return cachedRows.concat(selectedRows);
-    }
-    async handleExecuteContext(executeContext) {
-        const multiKeyMap = executeContext[TMP_CTX_KEY];
-        if (!multiKeyMap || multiKeyMap.isEmpty()) {
-            return;
-        }
-        dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
-            const sourceColumn = columnRelation.sourceColumn;
-            const targetColumns = columnRelation.targetColumns;
-            if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
-                columnRelation.targetColumns = [
-                    {
-                        from: '*',
-                        to: `${sourceColumn}_info[$ARRAY_INDEX]`,
-                    },
-                ];
-            }
-            dictMixUtils.copyColumnRelationToRow(row, multiKeyMap, columnRelation);
-        });
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], CurdMixByDictService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], CurdMixByDictService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", RedisCacheService_1.RedisCacheService)
-], CurdMixByDictService.prototype, "redisCacheService", void 0);
-CurdMixByDictService = __decorate([
-    (0, core_1.Provide)()
-], CurdMixByDictService);
-exports.CurdMixByDictService = CurdMixByDictService;
+"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.CurdMixByDictService = void 0;
+const _ = require("lodash");
+const core_1 = require("@midwayjs/core");
+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 MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
+const global_config_1 = require("../../libs/global-config/global-config");
+const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
+const SystemEntities_1 = require("../../models/SystemEntities");
+const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
+const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
+const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
+const DEFAULT_CACHE_SECOND = 60 * 5;
+let CurdMixByDictService = class CurdMixByDictService {
+    async getFromCache(code) {
+        const { curdMixByCommonCacheLevel } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
+        const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, SystemEntities_1.CacheNameEnum.CurdMixByDict);
+        return cacheService.getJsonObject(code);
+    }
+    async setToCache(code, value) {
+        const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
+        const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, SystemEntities_1.CacheNameEnum.CurdMixByDict);
+        return cacheService.setJsonObject(code, value, curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND);
+    }
+    async handleExecuteContextPrepare(executeContext) {
+        const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
+        if (!codes || codes.length === 0) {
+            return;
+        }
+        const rows = await this.getDictItemRows(codes);
+        executeContext[TMP_CTX_KEY] = new MultiKeyMap_1.MultiKeyMap(rows, 'dict_code', 'value');
+    }
+    async getDictItemRows(codes) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
+        const noCacheCodes = [];
+        // 从缓存里面取
+        let cachedRows = [];
+        for (let i = 0; i < codes.length; i++) {
+            const code = codes[i];
+            const rows1 = await this.getFromCache(code);
+            // const rows1 = [];
+            if (rows1 && rows1.length > 0) {
+                cachedRows = cachedRows.concat(rows1);
+            }
+            else {
+                noCacheCodes.push(code);
+            }
+        }
+        // 从数据库里面取
+        let selectedRows = [];
+        if (noCacheCodes.length > 0) {
+            const res1 = await this.curdProService.executeCrudByCfg({
+                condition: { dict_code: { $in: noCacheCodes } },
+            }, {
+                sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
+                sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+                sqlDatabase: SystemDbName,
+                sqlDbType: SystemDbType,
+            });
+            selectedRows = res1.getResRows();
+            //放到缓存里
+            for (let i = 0; i < noCacheCodes.length; i++) {
+                const noCacheCode = noCacheCodes[i];
+                const rows1 = selectedRows.filter(e => e.dict_code === noCacheCode);
+                await this.setToCache(noCacheCode, rows1);
+            }
+        }
+        return cachedRows.concat(selectedRows);
+    }
+    async handleExecuteContext(executeContext) {
+        const multiKeyMap = executeContext[TMP_CTX_KEY];
+        if (!multiKeyMap || multiKeyMap.isEmpty()) {
+            return;
+        }
+        dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row, columnRelation) => {
+            const sourceColumn = columnRelation.sourceColumn;
+            const targetColumns = columnRelation.targetColumns;
+            if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
+                columnRelation.targetColumns = [
+                    {
+                        from: '*',
+                        to: `${sourceColumn}_info[$ARRAY_INDEX]`,
+                    },
+                ];
+            }
+            dictMixUtils.copyColumnRelationToRow(row, multiKeyMap, columnRelation);
+        });
+    }
+};
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", Object)
+], CurdMixByDictService.prototype, "ctx", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CurdProService_1.CurdProService)
+], CurdMixByDictService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], CurdMixByDictService.prototype, "cacheServiceFactory", void 0);
+CurdMixByDictService = __decorate([
+    (0, core_1.Provide)()
+], CurdMixByDictService);
+exports.CurdMixByDictService = CurdMixByDictService;

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

@@ -1,31 +1,30 @@
-import { Context } from '@midwayjs/koa';
-import { CurdProService } from './CurdProService';
-import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { RedisCacheService } from '../base/RedisCacheService';
-export declare class CurdMixByLinkToCustomService implements IExecuteContextHandler {
-    protected ctx: Context;
-    protected curdProService: CurdProService;
-    protected redisCacheService: RedisCacheService;
-    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
-    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
-    queryInfoByLinkToCustom(code: string): Promise<Map<string, any>>;
-    /**
-     * code形如：mysql_________fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
-     * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
-     * code形如：fatcms~~~sys_perm_role~~~id,*
-     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
-     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
-     * 【数据库】~~~【表名】~~~【value】,【label】，【style】
-     * @param code
-     * @private
-     */
-    private queryInfoByLinkToCustomImpl;
-    /**
-     *
-     * @param code
-     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
-     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
-     */
-    private queryInfoByLinkToCustomByCrudMethod;
-    private loadInfoByLinkToCustomMap;
-}
+import { Context } from '@midwayjs/koa';
+import { CurdProService } from './CurdProService';
+import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
+export declare class CurdMixByLinkToCustomService implements IExecuteContextHandler {
+    protected ctx: Context;
+    protected curdProService: CurdProService;
+    private cacheServiceFactory;
+    handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
+    queryInfoByLinkToCustom(code: string): Promise<Map<string, any>>;
+    /**
+     * code形如：mysql_________fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
+     * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
+     * code形如：fatcms~~~sys_perm_role~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
+     * 【数据库】~~~【表名】~~~【value】,【label】，【style】
+     * @param code
+     * @private
+     */
+    private queryInfoByLinkToCustomImpl;
+    /**
+     *
+     * @param code
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,*
+     * code形如：GET_BY_CRUD_METHOD~~~GetActiveLineEnum~~~id,name
+     */
+    private queryInfoByLinkToCustomByCrudMethod;
+    private loadInfoByLinkToCustomMap;
+}