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

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -1,83 +1,121 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import * as _ from 'lodash';
-import { SystemTables} from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
-import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { parseConfigContentToEnumInfo } from "../../libs/utils/parseConfig";
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-
-const dictMixUtils = new CrudMixUtils(RelatedType.sysCfgEnum);
-
-const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
-
-
-
-@Provide()
-export class CurdMixBySysConfigService implements IExecuteContextHandler {
-  @Inject()
-  ctx: Context;
-
-  @Inject()
-  protected curdProService: CurdProService;
-
-  async handleExecuteContextPrepare(executeContext: ExecuteContext) {
-    
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    
-    const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
-    if (!codes || codes.length === 0) {
-      return;
-    }
-
-    const res1 = await this.curdProService.executeCrudByCfg(
-      {
-        condition: { config_code: { $in: codes } },
-      },
-      {
-        sqlTable: SystemTables.sys_configs,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    const rows = res1.getResRows();
-    const multiKeyMap = new MultiKeyMap();
-
-    if (Array.isArray(rows)) {
-      for (let i = 0; i < rows.length; i++) {
-        const row = rows[i];
-        const { config_code } = row;
-        const config_content_rows = parseConfigContentToEnumInfo(row); // 数组元素必须有value字段
-        multiKeyMap.addRowsValue1(config_content_rows, config_code, 'value');
-      }
-    }
-
-    executeContext[TMP_CTX_KEY] = multiKeyMap;
-  }
-
-
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
-    const multiKeyMap = executeContext[TMP_CTX_KEY] as MultiKeyMap;
-    if (!multiKeyMap || multiKeyMap.isEmpty()) {
-      return;
-    }
-
-    dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
-      const sourceColumn = columnRelation.sourceColumn;
-      const targetColumns = columnRelation.targetColumns;
-      if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
-        columnRelation.targetColumns = [
-          { from: 'label', to: `${sourceColumn}_info.label` },
-          { from: 'style', to: `${sourceColumn}_info.style` },
-        ];
-      }
-      dictMixUtils.copyColumnRelationToRow(row, multiKeyMap, columnRelation);
-    });
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { CurdProService } from './CurdProService';
+import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
+import { CrudMixUtils, RelatedType } from './CurdMixUtils';
+import * as _ from 'lodash';
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { MultiKeyMap } from '@/libs/crud-pro/utils/MultiKeyMap';
+import { ColumnRelation } from '@/libs/crud-pro/interfaces';
+import { parseConfigContentToEnumInfo } from '@/libs/utils/parseConfig';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
+import { CacheNameEnum} from "@/models/bizmodels";
+
+const dictMixUtils = new CrudMixUtils(RelatedType.sysCfgEnum);
+
+const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
+
+
+@Provide()
+export class CurdMixBySysConfigService implements IExecuteContextHandler {
+  @Inject()
+  ctx: Context;
+
+  @Inject()
+  protected curdProService: CurdProService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+
+  private async getFromCache(code: string): Promise<any> {
+    const cacheService = this.cacheServiceFactory.getCacheServiceByName(CacheNameEnum.GetSysConfigOne);
+    return cacheService.getJsonObject(code);
+  }
+
+  private async setToCache(code: string, value: any): Promise<any> {
+    const cacheService = this.cacheServiceFactory.getCacheServiceByName(CacheNameEnum.GetSysConfigOne);
+    return cacheService.setJsonObject(code, value);
+  }
+
+
+  private async queryConfigRowsUseCache(codes: string[]): Promise<any[]> {
+
+    const resultRowMap = {} as Record<string, any>;
+    for (let i = 0; i < codes.length; i++) {
+      const code = codes[i];
+      const row = await this.getFromCache(code);
+      if (row) {
+        resultRowMap[code] = row;
+      }
+    }
+
+    const notCachedCodes = codes.filter((code) => !resultRowMap[code]);
+    if (notCachedCodes.length === 0) {
+      return Object.values(resultRowMap);
+    }
+
+    const {SystemDbName, SystemDbType} = GLOBAL_STATIC_CONFIG.getConfig();
+    const res1 = await this.curdProService.executeCrudByCfg(
+      {
+        condition: {config_code: {$in: notCachedCodes}},
+      },
+      {
+        sqlTable: SystemTables.sys_configs,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const rows = res1.getResRows();
+    if (Array.isArray(rows) && rows.length > 0) {
+      for (let i = 0; i < rows.length; i++) {
+        const row = rows[i];
+        const {config_code} = row;
+        await this.setToCache(config_code, row);
+        resultRowMap[config_code] = row;
+      }
+    }
+    return Object.values(resultRowMap)
+  }
+
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
+    const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
+    if (!codes || codes.length === 0) {
+      return;
+    }
+
+    const multiKeyMap = new MultiKeyMap();
+    const rows = await this.queryConfigRowsUseCache(codes);
+
+    for (let i = 0; i < rows.length; i++) {
+      const row = rows[i];
+      const { config_code } = row;
+      const config_content_rows = parseConfigContentToEnumInfo(row); // 数组元素必须有value字段
+      multiKeyMap.addRowsValue1(config_content_rows, config_code, 'value');
+    }
+
+    executeContext[TMP_CTX_KEY] = multiKeyMap;
+  }
+
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
+    const multiKeyMap = executeContext[TMP_CTX_KEY] as MultiKeyMap;
+    if (!multiKeyMap || multiKeyMap.isEmpty()) {
+      return;
+    }
+
+    dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
+      const sourceColumn = columnRelation.sourceColumn;
+      const targetColumns = columnRelation.targetColumns;
+      if (!Array.isArray(targetColumns) || targetColumns.length === 0) {
+        columnRelation.targetColumns = [
+          { from: 'label', to: `${sourceColumn}_info.label` },
+          { from: 'style', to: `${sourceColumn}_info.style` },
+        ];
+      }
+      dictMixUtils.copyColumnRelationToRow(row, multiKeyMap, columnRelation);
+    });
+  }
+}

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -1,72 +1,71 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import * as _ from 'lodash';
-import { LRUCache } from 'lru-cache';
-import { CurdProService } from './CurdProService';
-import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
-import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import { SystemTables } from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import { ColumnRelation } from '../../libs/crud-pro/interfaces';
-import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-
-const lruCache = new LRUCache<string, any>({
-  max: 500,
-  ttl: 1000 * 60 * 5,
-  ttlAutopurge: true,
-});
-
-const workbenchMixUtils = new CrudMixUtils(RelatedType.workbenchBasic);
-
-const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
-
-@Provide()
-export class CurdMixByWorkbenchService implements IExecuteContextHandler {
-  @Inject()
-  ctx: Context;
-
-  @Inject()
-  protected curdProService: CurdProService;
-
-  private async loadWorkbenchListMap() {
-    
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    let workbenchListMap = lruCache.get('workbenchListMap');
-    if (!workbenchListMap) {
-      const reqJson = {
-        columns: 'workbench_code,workbench_name,workbench_domain',
-        condition: {},
-      };
-      const res = await this.curdProService.executeCrudByCfg(reqJson, {
-        sqlTable: SystemTables.sys_workbench,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      });
-      const workbenchList = res.getResRows();
-      workbenchListMap = MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);
-      lruCache.set('workbenchListMap', workbenchListMap);
-    }
-    return workbenchListMap;
-  }
-
-  async handleExecuteContextPrepare(executeContext: ExecuteContext) {
-    const relations = workbenchMixUtils.pickColumnRelations(executeContext);
-    if (!relations || relations.length === 0) {
-      return;
-    }
-    executeContext[TMP_CTX_KEY] = await this.loadWorkbenchListMap();
-  }
-
-  async handleExecuteContext(executeContext: ExecuteContext): Promise<void> {
-    const userInfoMap = executeContext[TMP_CTX_KEY] as Map<string, any>;
-    if (!userInfoMap || userInfoMap.size === 0) {
-      return;
-    }
-    workbenchMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
-      workbenchMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
-    });
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import * as _ from 'lodash';
+import { CurdProService } from './CurdProService';
+import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
+import { CrudMixUtils, RelatedType } from './CurdMixUtils';
+import { SystemTables } from '@/models/SystemTables';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
+import { ColumnRelation } from '@/libs/crud-pro/interfaces';
+import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
+import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
+import { CacheNameEnum} from "@/models/bizmodels";
+
+const workbenchMixUtils = new CrudMixUtils(RelatedType.workbenchBasic);
+
+const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
+
+
+@Provide()
+export class CurdMixByWorkbenchService implements IExecuteContextHandler {
+  @Inject()
+  protected ctx: Context;
+
+  @Inject()
+  protected curdProService: CurdProService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  private async loadWorkbenchListMap(): Promise<Map<string, any>> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    return await this.cacheServiceFactory.getJsonObjectCache({
+      cacheKey: CacheNameEnum.CurdMixByWorkbench,
+      cacheName: CacheNameEnum.CurdMixByWorkbench,
+      refreshCache: false,
+      getter: async () => {
+        const reqJson = {
+          columns: 'workbench_code,workbench_name,workbench_domain',
+          condition: {},
+        };
+        const res = await this.curdProService.executeCrudByCfg(reqJson, {
+          sqlTable: SystemTables.sys_workbench,
+          sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+          sqlDatabase: SystemDbName,
+          sqlDbType: SystemDbType,
+        });
+        const workbenchList = res.getResRows();
+        return MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);
+      },
+    });
+  }
+
+  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {
+    const relations = workbenchMixUtils.pickColumnRelations(executeContext);
+    if (!relations || relations.length === 0) {
+      return;
+    }
+    executeContext[TMP_CTX_KEY] = await this.loadWorkbenchListMap();
+  }
+
+  async handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void> {
+    const userInfoMap = executeContext[TMP_CTX_KEY] as Map<string, any>;
+    if (!userInfoMap || userInfoMap.size === 0) {
+      return;
+    }
+    workbenchMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
+      workbenchMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+    });
+  }
+}

package/src/service/curd/CurdMixService.ts

@@ -1,65 +1,97 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { CurdProService } from './CurdProService';
-import { CurdMixByDictService } from './CurdMixByDictService';
-import { IRequestCfgModel, IRequestModel, ISqlCfgModel } from '../../libs/crud-pro/interfaces';
-import { CurdMixBySysConfigService } from './CurdMixBySysConfigService';
-import { CurdMixByAccountService } from './CurdMixByAccountService';
-import { RelatedType } from './CurdMixUtils';
-import { CurdMixByWorkbenchService } from './CurdMixByWorkbenchService';
-import { IRequestCfgModel2 } from '../../models/bizmodels';
-import {CurdMixByLinkToCustomService} from "./CurdMixByLinkToCustomService";
-import {SqlDbType} from "../../libs/crud-pro/models/keys";
-
-@Provide()
-export class CurdMixService {
-  @Inject()
-  private curdProService: CurdProService;
-
-  @Inject()
-  private curdMixByDictService: CurdMixByDictService;
-
-  @Inject()
-  private curdMixBySysConfigService: CurdMixBySysConfigService;
-
-  @Inject()
-  private curdMixByAccountService: CurdMixByAccountService;
-
-  @Inject()
-  private curdMixByWorkbenchService: CurdMixByWorkbenchService;
-
-  @Inject()
-  private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
-
-
-  private prepare() {
-    this.curdProService.setResponseCfgHandlers(RelatedType.dict, this.curdMixByDictService);
-    this.curdProService.setResponseCfgHandlers(RelatedType.sysCfgEnum, this.curdMixBySysConfigService);
-    this.curdProService.setResponseCfgHandlers(RelatedType.accountBasic, this.curdMixByAccountService);
-    this.curdProService.setResponseCfgHandlers(RelatedType.workbenchBasic, this.curdMixByWorkbenchService);
-    this.curdProService.setResponseCfgHandlers(RelatedType.linkToCustom, this.curdMixByLinkToCustomService);
-  }
-
-  async executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2) {
-    this.prepare();
-    return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-  }
-
-  getBbUtil(database: string, sqlDdType: SqlDbType) {
-    this.prepare();
-    return this.curdProService.getBbUtil(database, sqlDdType);
-  }
-
-  async executeSQL(sqlCfgModel: ISqlCfgModel) {
-    this.prepare();
-    return this.curdProService.executeSQL(sqlCfgModel);
-  }
-
-  async executeCrud(reqJson: IRequestModel) {
-    this.prepare();
-    return this.curdProService.executeCrud(reqJson);
-  }
-
-  public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {
-    return this.curdProService.getCachedCfgByMethod(method);
-  }
-}
+import { Inject, Provide } from '@midwayjs/core';
+import { CurdProService } from './CurdProService';
+import { CurdMixByDictService } from './CurdMixByDictService';
+import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel } from '@/libs/crud-pro/interfaces';
+import { CurdMixBySysConfigService } from './CurdMixBySysConfigService';
+import { CurdMixByAccountService } from './CurdMixByAccountService';
+import { RelatedType } from './CurdMixUtils';
+import { CurdMixByWorkbenchService } from './CurdMixByWorkbenchService';
+import { IRequestCfgModel2 } from '@/models/bizmodels';
+import { CurdMixByLinkToCustomService } from './CurdMixByLinkToCustomService';
+import { SqlDbType } from '@/libs/crud-pro/models/keys';
+import { ExecuteContext, IExecuteContextCustom } from '@/libs/crud-pro/models/ExecuteContext';
+
+export interface ILinkColumnRelationParam {
+  columnsRelations: ColumnRelation[];
+}
+
+@Provide()
+export class CurdMixService {
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Inject()
+  private curdMixByDictService: CurdMixByDictService;
+
+  @Inject()
+  private curdMixBySysConfigService: CurdMixBySysConfigService;
+
+  @Inject()
+  private curdMixByAccountService: CurdMixByAccountService;
+
+  @Inject()
+  private curdMixByWorkbenchService: CurdMixByWorkbenchService;
+
+  @Inject()
+  private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
+
+  private prepare() {
+    this.curdProService.setResponseCfgHandlers(RelatedType.dict, this.curdMixByDictService);
+    this.curdProService.setResponseCfgHandlers(RelatedType.sysCfgEnum, this.curdMixBySysConfigService);
+    this.curdProService.setResponseCfgHandlers(RelatedType.accountBasic, this.curdMixByAccountService);
+    this.curdProService.setResponseCfgHandlers(RelatedType.workbenchBasic, this.curdMixByWorkbenchService);
+    this.curdProService.setResponseCfgHandlers(RelatedType.linkToCustom, this.curdMixByLinkToCustomService);
+  }
+
+  async executeCrudByCfg(reqJson: IRequestModel, cfgModel: IRequestCfgModel2): Promise<ExecuteContext> {
+    this.prepare();
+    return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
+  }
+
+  getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
+    this.prepare();
+    return this.curdProService.getBbUtil(sqlDatabase, sqlDbType, sqlTable);
+  }
+
+  async executeSQL(sqlCfgModel: ISqlCfgModel) {
+    this.prepare();
+    return this.curdProService.executeSQL(sqlCfgModel);
+  }
+
+  async executeCrud(reqJson: IRequestModel) {
+    this.prepare();
+    return this.curdProService.executeCrud(reqJson);
+  }
+
+  public async getCachedCfgByMethod(method: string): Promise<IRequestCfgModel> {
+    return this.curdProService.getCachedCfgByMethod(method);
+  }
+
+  /**
+   * 根据配置的关联关系，直接关联数据
+   * @param rows
+   * @param param
+   * @returns
+   */
+  public async linkColumnRelationDatas(rows: any[], param: ILinkColumnRelationParam) {
+    if (!Array.isArray(rows) || rows.length === 0) {
+      return;
+    }
+
+    this.prepare();
+
+    const exeCtx: IExecuteContextCustom = {
+      rows,
+      columnsRelation: param.columnsRelations,
+      isCustomContext: true,
+    };
+
+    const responseCfgHandlers = this.curdProService.getResponseCfgHandlers();
+    const handlers = Object.values(responseCfgHandlers);
+    for (let i = 0; i < handlers.length; i++) {
+      const handler = handlers[i];
+      await handler.handleExecuteContextPrepare(exeCtx);
+      await handler.handleExecuteContext(exeCtx);
+    }
+  }
+}