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

package/src/service/EnumInfoService.ts

@@ -1,134 +1,124 @@
-import {Inject, Provide} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {KeysOfSimpleSQL} from '../libs/crud-pro/models/keys';
-import {CurdProService} from './curd/CurdProService';
-import {RelatedType} from './curd/CurdMixUtils';
-import {SystemTables} from '../models/SystemTables';
-import {parseConfigContentToEnumInfo, IEnumInfo} from '../libs/utils/parseConfig';
-import {RedisCacheService} from "./base/RedisCacheService";
-import {CurdMixByLinkToCustomService} from "./curd/CurdMixByLinkToCustomService";
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-
-
-interface IQueryEnumInfo {
-  type: RelatedType;
-  code: string;
-}
-interface IQueryEnumResult {
-  type: RelatedType;
-  code: string;
-  values: IEnumInfo[];
-}
-
-
-function filterEmpty(e: IEnumInfo): boolean {
-  return e.label && typeof e.value !== 'undefined';
-}
-
-
-
-@Provide()
-export class EnumInfoService {
-  @Inject()
-  ctx: Context;
-  @Inject()
-  private curdProService: CurdProService;
-
-  @Inject()
-  private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
-
-  @Inject()
-  private redisCacheService: RedisCacheService;
-
-  async queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]> {
-
-    const expireSecond = 2 * 60 ;
-
-    const result = [];
-    for (let i = 0; i < codeList.length; i++) {
-      const {code, type} = codeList[i];
-      const cacheKey = `enums@@${type}@@${code}`;
-      const emums = refreshCache? null : await this.redisCacheService.getJsonObject(cacheKey);
-      if (!Array.isArray(emums) || emums.length === 0) {
-        let values;
-        if (type === RelatedType.sysCfgEnum) {
-          values = await this.queryEnumInfoBySysCfgEnum(code);
-         await this.redisCacheService.setJsonObject(cacheKey, values, expireSecond);
-        } else if (type === RelatedType.dict) {
-          values = await this.queryEnumInfoItemByDict(code);
-          await this.redisCacheService.setJsonObject(cacheKey, values, expireSecond);
-        } else if (type === RelatedType.linkToCustom) {
-          values = await this.queryEnumInfoByLinkToCustom(code);
-          // await this.redisCacheService.setJsonObject(cacheKey, values, expireSecond);
-        }
-        result.push({type, code, values});
-      } else {
-        result.push({type, code, values: emums});
-      }
-    }
-    return result;
-  }
-
-  /**
-   * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
-   * code形如：fatcms~~~sys_perm_role~~~id,*
-   * 【数据库】~~~【表名】~~~【label】,【value】，【style】
-   * @param code
-   * @private
-   */
-  private async queryEnumInfoByLinkToCustom(code: string): Promise<IEnumInfo[]> {
-    const cc = await this.curdMixByLinkToCustomService.queryInfoByLinkToCustom(code);
-    if (!cc) {
-      return [];
-    }
-    const keys = [...cc.keys()];
-    return keys.map(value => {
-      const label = cc.get(value);
-      return {label, value}
-    })
-  }
-
-  private async queryEnumInfoBySysCfgEnum(code: string): Promise<IEnumInfo[]> {
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    
-    const res1 = await this.curdProService.executeCrudByCfg(
-      {
-        condition: { config_code: code },
-      },
-      {
-        sqlTable: SystemTables.sys_configs,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    const obj = res1.getOneObj();
-    if (!obj) {
-      return null;
-    }
-
-    const rows = parseConfigContentToEnumInfo(obj);
-    return rows.map(e => ({ label: e.label, value: e.value , children: e.children})).filter(filterEmpty);
-  }
-
-  private async queryEnumInfoItemByDict(code: string): Promise<IEnumInfo[]> {
-    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    
-    const res1 = await this.curdProService.executeCrudByCfg(
-      {
-        condition: { dict_code: code },
-      },
-      {
-        sqlTable: SystemTables.sys_data_dict_item,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
-      }
-    );
-    const obj = res1.getResRows();
-    if (!obj) {
-      return null;
-    }
-    return obj.map(e => ({ label: e.label, value: e.value })).filter(filterEmpty);
-  }
-}
+import {Inject, Provide} from '@midwayjs/core';
+import {Context} from '@midwayjs/koa';
+import {KeysOfSimpleSQL} from '@/libs/crud-pro/models/keys';
+import {CurdProService} from './curd/CurdProService';
+import {RelatedType} from './curd/CurdMixUtils';
+import {SystemTables} from '@/models/SystemTables';
+import {IEnumInfo, parseConfigContentToEnumInfo} from '@/libs/utils/parseConfig';
+import {CurdMixByLinkToCustomService} from './curd/CurdMixByLinkToCustomService';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from './base/cache/CacheServiceFactory';
+import { CacheNameEnum } from "@/models/bizmodels";
+import { SysConfigService } from "@/service/SysConfigService";
+
+interface IQueryEnumInfo {
+  type: RelatedType;
+  code: string;
+}
+interface IQueryEnumResult {
+  type: RelatedType;
+  code: string;
+  values: IEnumInfo[];
+}
+
+function filterEmpty(e: IEnumInfo): boolean {
+  return e.label && typeof e.value !== 'undefined';
+}
+
+
+@Provide()
+export class EnumInfoService {
+  @Inject()
+  ctx: Context;
+  @Inject()
+  private curdProService: CurdProService;
+
+  @Inject()
+  private curdMixByLinkToCustomService: CurdMixByLinkToCustomService;
+
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
+  @Inject()
+  private sysConfigService: SysConfigService
+
+  async queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]> {
+
+    const getEnumInfoByCode = async (type: RelatedType, code: string) => {
+      if (type === RelatedType.linkToCustom) {
+        return await this.queryEnumInfoByLinkToCustom(code);
+      }
+      if (type === RelatedType.sysCfgEnum) {
+        return await this.queryEnumInfoBySysCfgEnum(code);
+      }
+
+      const cacheKey = `${type}@@${code}`;
+      return await this.cacheServiceFactory.getJsonObjectCache({
+        cacheKey,
+        refreshCache,
+        cacheName: CacheNameEnum.GetEnumInfoByCode,
+        getter: async () => {
+          if (type === RelatedType.dict) {
+            return await this.queryEnumInfoItemByDict(code);
+          }
+          return [];
+        },
+      });
+    };
+
+    const result = [];
+    for (let i = 0; i < codeList.length; i++) {
+      const { code, type } = codeList[i];
+      const emums = await getEnumInfoByCode(type, code);
+      result.push({ type, code, values: emums });
+    }
+
+    return result;
+  }
+
+  /**
+   * code形如：fatcms~~~sys_perm_role~~~role_code,role_name,xxx_name
+   * code形如：fatcms~~~sys_perm_role~~~id,*
+   * 【数据库】~~~【表名】~~~【label】,【value】，【style】
+   * @param code
+   * @private
+   */
+  private async queryEnumInfoByLinkToCustom(code: string): Promise<IEnumInfo[]> {
+    const cc = await this.curdMixByLinkToCustomService.queryInfoByLinkToCustom(code);
+    if (!cc) {
+      return [];
+    }
+    const keys = [...cc.keys()];
+    return keys.map(value => {
+      const label = cc.get(value);
+      return { label, value };
+    });
+  }
+
+  private async queryEnumInfoBySysCfgEnum(code: string): Promise<IEnumInfo[]> {
+    const obj = await this.sysConfigService.getSysConfigOne(code);
+    const rows = parseConfigContentToEnumInfo(obj);
+    return rows.map(e => ({ label: e.label, value: e.value, style: e.style, children: e.children })).filter(filterEmpty);
+  }
+
+  private async queryEnumInfoItemByDict(code: string): Promise<IEnumInfo[]> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    const res1 = await this.curdProService.executeCrudByCfg(
+      {
+        condition: { dict_code: code },
+      },
+      {
+        sqlTable: SystemTables.sys_data_dict_item,
+        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+        sqlDatabase: SystemDbName,
+        sqlDbType: SystemDbType,
+      }
+    );
+    const obj = res1.getResRows();
+    if (!obj) {
+      return null;
+    }
+    return obj.map(e => ({ label: e.label, value: e.value })).filter(filterEmpty);
+  }
+}