midway-fatcms 0.0.6 → 0.0.8

package/src/service/SysMenuService.ts

@@ -57,7 +57,11 @@ export class SysMenuService extends BaseService {
 
   private get sys_menus_table() {
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, SystemTables.sys_menus)
+    return this.curdProService.getQuickCrud({
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      sqlTable: SystemTables.sys_menus,
+    })
   }
 
 
@@ -70,9 +74,10 @@ export class SysMenuService extends BaseService {
       cacheKey: CacheNameEnum.GetSysMenusList,
       cacheName: CacheNameEnum.GetSysMenusList,
       getter: async () => {
-        return await this.sys_menus_table.getList({
+        const res =  await this.sys_menus_table.findList({
           condition: {}
         });
+        return res.rows;
       },
     });
   }

package/src/service/crudstd/CrudStdService.ts

@@ -98,7 +98,7 @@ export class CrudStdService extends ApiBaseService {
     if (!appInfo || appInfo.status !== 1) {
       throw new BizException('应用不存在或已下线：' + appCode);
     }
-    
+
     const stdCrudCfgObj = appInfo.stdCrudCfgObj;
 
     //删除策略
@@ -296,7 +296,7 @@ export class CrudStdService extends ApiBaseService {
     if (!appInfo) {
       return null;
     }
-    const { app_schema, ...others } = appInfo;
+    const { app_schema, ...others } = appInfo as any;
     const stdCrudCfgObj = parseJsonObject(app_schema);
 
     const handleArrayCfg = (arrayCfg: any[]) => {

package/src/service/curd/CurdMixService.ts

@@ -1,15 +1,17 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { CurdProService } from './CurdProService';
 import { CurdMixByDictService } from './CurdMixByDictService';
-import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery } from '@/libs/crud-pro/interfaces';
+import { ColumnRelation, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, ExecuteSQLResult } 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 { SqlDbType } from '@/libs/crud-pro/models/keys';
 import { ExecuteContext, IExecuteContextCustom } from '@/libs/crud-pro/models/ExecuteContext';
+import { ShardingCrudPro } from "@/libs/crud-sharding";
+import { IGetQuickCrudParam, IGetShardingCrudParam } from './CurdProService';
 
 export interface ILinkColumnRelationParam {
   columnsRelations: ColumnRelation[];
@@ -48,12 +50,31 @@ export class CurdMixService {
     return this.curdProService.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
+
+  // /**
+  //  * @deprecated 请使用 getQuickCrud 替代
+  //  * @param sqlDatabase
+  //  * @param sqlDbType
+  //  * @param sqlTable
+  //  */
+  // getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string) {
+  //   this.prepare();
+  //   return this.curdProService.getQuickCrud({ sqlDatabase, sqlDbType, sqlTable });
+  // }
+
+  getQuickCrud(param: IGetQuickCrudParam) {
     this.prepare();
-    return this.curdProService.getQuickCrud(sqlDatabase, sqlDbType, sqlTable);
+    return this.curdProService.getQuickCrud(param);
   }
 
-  async executeSQL(sqlCfgModel: ISqlCfgModel) {
+
+  public getShardingCrud(param: IGetShardingCrudParam): ShardingCrudPro {
+    this.prepare();
+    return this.curdProService.getShardingCrud(param);
+  }
+
+
+  async executeSQL(sqlCfgModel: ISqlCfgModel): Promise<ExecuteSQLResult> {
     this.prepare();
     return this.curdProService.executeSQL(sqlCfgModel);
   }

package/src/service/curd/CurdProService.ts

@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import { Config, Inject, Provide } from '@midwayjs/core';
 import { CrudPro } from '@/libs/crud-pro/CrudPro';
 import { Context } from '@midwayjs/koa';
-import { IConnectionPool, ICrudProCfg, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery } from '@/libs/crud-pro/interfaces';
+import { IConnectionPool, ICrudProCfg, IRequestCfgModel, IRequestModel, ISqlCfgModel, ITableListResult, ITableNamesOptions, ITableNamesQuery, ExecuteSQLResult } from '@/libs/crud-pro/interfaces';
 import { SqlCfgModel } from '@/libs/crud-pro/models/SqlCfgModel';
 import { getConnectionPool as getMySQLConnectionPool } from '../../libs/crud-pro/utils/pool/MySQLUtils';
 import { getConnectionPool as getPostgresConnectionPool } from '../../libs/crud-pro/utils/pool/PostgresUtils';
@@ -16,11 +16,35 @@ import { RelatedType } from './CurdMixUtils';
 import { BaseService } from '../base/BaseService';
 import { IRequestCfgModel2, IVisitorExt } from '@/models/bizmodels';
 import { IWorkbenchEntity } from '@/models/SystemEntities';
-import { CrudProQuick } from './CrudProQuick';
+import { CrudProQuick } from '@/libs/crud-pro-quick';
 import { ShardingCrudPro, IShardingConfig } from '@/libs/crud-sharding';
 import { fixCfgModel } from './fixCfgModel';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-import { fixSoftDelete } from "@/service/curd/fixSoftDelete";
+import { fixSoftDelete } from "@/libs/crud-pro-quick/fixSoftDelete";
+
+/**
+ * getQuickCrud 参数接口
+ */
+export interface IGetQuickCrudParam {
+  /** 数据库名 */
+  sqlDatabase: string;
+  /** 数据库类型 */
+  sqlDbType: SqlDbType;
+  /** 表名（可选） */
+  sqlTable?: string;
+}
+
+/**
+ * getShardingCrud 参数接口
+ */
+export interface IGetShardingCrudParam {
+  /** 数据库名 */
+  sqlDatabase: string;
+  /** 数据库类型 */
+  sqlDbType: SqlDbType;
+  /** 分表配置 */
+  shardingConfig: IShardingConfig;
+}
 
 function toVisitor(ctx: Context): IVisitorExt {
   const workbenchInfo: IWorkbenchEntity = ctx.workbenchInfo;
@@ -205,7 +229,7 @@ export class CurdProService extends BaseService {
   }
 
   // 直接执行一个SQL
-  public async executeSQL(sqlCfgModel: ISqlCfgModel): Promise<any> {
+  public async executeSQL(sqlCfgModel: ISqlCfgModel): Promise<ExecuteSQLResult> {
     const curdPro = this.getCrudPro();
     return curdPro.executeSQL(sqlCfgModel);
   }
@@ -217,64 +241,59 @@ export class CurdProService extends BaseService {
     // 应用标准的updateCfg。
     fixCfgModel(cfgModel);
     // 应用软删除动作。
-    fixSoftDelete(cfgModel.sqlSimpleName, cfgModel, reqJson, this.ctx);
+    fixSoftDelete(cfgModel.sqlSimpleName, cfgModel, reqJson, curdPro.getVisitor());
     return await curdPro.executeCrudByCfg(reqJson, cfgModel);
   }
 
-  /**
-   * 获取 CrudProQuick 工具类（已废弃）
-   *
-   * @deprecated 请使用 getQuickCrud 替代
-   * @param sqlDatabase 数据库名
-   * @param sqlDbType 数据库类型
-   * @param sqlTable 表名（可选）
-   * @returns CrudProQuick 实例
-   */
-  public getBbUtil(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick {
-    return this.getQuickCrud(sqlDatabase, sqlDbType, sqlTable);
-  }
 
   /**
    * 获取 CrudProQuick 工具类
    *
    * 提供快速 CRUD 操作的便捷方法，封装了常用的数据库操作。
    *
-   * @param sqlDatabase 数据库名
-   * @param sqlDbType 数据库类型
-   * @param sqlTable 表名（可选）
+   * @param param 参数对象
    * @returns CrudProQuick 实例
    *
    * @example
-   * const quick = curdProService.getQuickCrud('mydb', SqlDbType.mysql, 't_user');
-   * const users = await quick.query({ status: 'active' });
+   * const quick = curdProService.getQuickCrud({
+   *   sqlDatabase: 'mydb',
+   *   sqlDbType: SqlDbType.mysql,
+   *   sqlTable: 't_user',
+   * });
+   * const users = await quick.find({ status: 'active' });
    */
-  public getQuickCrud(sqlDatabase: string, sqlDbType: SqlDbType, sqlTable?: string): CrudProQuick {
-    const curdPro = this.getCrudPro();
-    return new CrudProQuick({ curdPro, sqlDatabase, sqlDbType, sqlTable, ctx: this.ctx });
+  public getQuickCrud(param: IGetQuickCrudParam): CrudProQuick {
+    const { sqlDatabase, sqlDbType, sqlTable } = param;
+    // 传入工厂函数，每次需要时创建新的 CrudPro 实例
+    return new CrudProQuick({
+      crudProFactory: () => this.getCrudPro(),
+      sqlDatabase,
+      sqlDbType,
+      sqlTable,
+    });
   }
 
   /**
    * 获取分表 CRUD 操作器
    *
-   * @param sqlDatabase 数据库名
-   * @param sqlDbType 数据库类型
-   * @param shardingConfig 分表配置
+   * @param param 参数对象
    * @returns ShardingCrudPro 实例
    *
    * @example
-   * const sharding = curdProService.getShardingCrud('mydb', SqlDbType.mysql, {
-   *   type: ShardingType.MONTH,
-   *   baseTable: 't_order',
-   *   timeColumn: 'created_at',
+   * const sharding = curdProService.getShardingCrud({
+   *   sqlDatabase: 'mydb',
+   *   sqlDbType: SqlDbType.mysql,
+   *   shardingConfig: {
+   *     type: ShardingType.MONTH,
+   *     baseTable: 't_order',
+   *     timeColumn: 'created_at',
+   *   },
    * });
    */
-  public getShardingCrud(
-    sqlDatabase: string,
-    sqlDbType: SqlDbType,
-    shardingConfig: IShardingConfig
-  ): ShardingCrudPro {
-    const curdPro = this.getCrudPro();
-    const sharding = new ShardingCrudPro(curdPro, shardingConfig);
+  public getShardingCrud(param: IGetShardingCrudParam): ShardingCrudPro {
+    const { sqlDatabase, sqlDbType, shardingConfig } = param;
+    // 传入工厂函数，每次需要时创建新的 CrudPro 实例
+    const sharding = new ShardingCrudPro(() => this.getCrudPro(), shardingConfig);
     sharding.setBaseCfg({ sqlDatabase, sqlDbType });
     return sharding;
   }

package/src/service/flow/FlowConfigService.ts

@@ -62,7 +62,11 @@ export class FlowConfigService extends BaseService {
 
   private get flow_config(){
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    return this.curdProService.getQuickCrud(SystemDbName, SystemDbType, FLOW_TABLES.flow_config)
+    return this.curdProService.getQuickCrud({
+      sqlDatabase: SystemDbName,
+      sqlDbType: SystemDbType,
+      sqlTable: FLOW_TABLES.flow_config,
+    })
   }
 
   private toCacheKey(flow_code: string, flow_version: number): string {
@@ -81,9 +85,10 @@ export class FlowConfigService extends BaseService {
       cacheKey: cacheKey,
       cacheName: CacheNameEnum.GetFlowConfigOne,
       getter: async () => {
-        return await this.flow_config.getUniqueOne({
+        const res = await this.flow_config.findUniqueOne({
           condition: {flow_code, flow_version, deleted_at: 0}
         });
+        return res.row;
       },
     });
   }

package/src/service/flow/FlowInstanceCrudService.ts

@@ -4,7 +4,7 @@ import * as moment from 'moment';
 import { FlowInstance, FLOW_TABLES, FlowInstanceTask, TaskStatusEnum, FlowInstanceNode, NodeStatusEnum } from "@/models/FlowModel";
 import { FlowNodeCfgInfo, ParsedFlowConfig } from './FlowConfigService';
 import { BaseService } from "@/service/base/BaseService";
-import { CrudProQuick } from "@/service/curd/CrudProQuick";
+import { CrudProQuick } from "@/libs/crud-pro-quick";
 import { CurdProService } from "@/service/curd/CurdProService";
 import { GLOBAL_STATIC_CONFIG } from "@/libs/global-config/global-config";
 
@@ -24,7 +24,10 @@ export class FlowInstanceCrudService extends BaseService {
 
   private get flowDB(): CrudProQuick {
     const { FlowDbName, FlowDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    const util = this.curdProService.getQuickCrud(FlowDbName, FlowDbType);
+    const util = this.curdProService.getQuickCrud({
+      sqlDatabase: FlowDbName,
+      sqlDbType: FlowDbType,
+    });
     util.setBaseCfgModel({ maxLimit: 100000 });
     return util;
   }
@@ -71,7 +74,7 @@ export class FlowInstanceCrudService extends BaseService {
       modified_at: getCurrentDateTime(),
       deleted_at: 0,
     }
-    const nodeInstanceId = await this.flowDB.insertObject({
+    const nodeInstanceId = await this.flowDB.insert({
       data: nodeInstance,
     }, FLOW_TABLES.flow_instance_node);
     nodeInstance.id = nodeInstanceId.insertId;
@@ -95,7 +98,7 @@ export class FlowInstanceCrudService extends BaseService {
       modified_at: getCurrentDateTime(),
       deleted_at: 0,
     }
-    const taskInstanceId = await this.flowDB.insertObject({
+    const taskInstanceId = await this.flowDB.insert({
       data: taskInstance,
     }, FLOW_TABLES.flow_instance_task);
     taskInstance.id = taskInstanceId.insertId;
@@ -107,7 +110,7 @@ export class FlowInstanceCrudService extends BaseService {
     if (updateNodeInstance.id) {
       updateNodeInstance.modified_by = this.getCurrentUserAccountId();
       updateNodeInstance.modified_at = getCurrentDateTime();
-      await this.flowDB.updateObject({
+      await this.flowDB.update({
         condition: {
           id: updateNodeInstance.id,
         },
@@ -117,7 +120,7 @@ export class FlowInstanceCrudService extends BaseService {
     } else {
       updateNodeInstance.created_by = this.getCurrentUserAccountId();
       updateNodeInstance.created_at = getCurrentDateTime();
-      const res = await this.flowDB.insertObject({
+      const res = await this.flowDB.insert({
         data: updateNodeInstance,
       }, FLOW_TABLES.flow_instance_node);
       return res.insertId || '';
@@ -133,7 +136,7 @@ export class FlowInstanceCrudService extends BaseService {
     if (taskInstance.id) {
       taskInstance.modified_by = this.getCurrentUserAccountId();
       taskInstance.modified_at = getCurrentDateTime();
-      await this.flowDB.updateObject({
+      await this.flowDB.update({
         condition: {
           id: taskInstance.id,
         },
@@ -143,7 +146,7 @@ export class FlowInstanceCrudService extends BaseService {
     } else {
       taskInstance.created_by = this.getCurrentUserAccountId();
       taskInstance.created_at = getCurrentDateTime();
-      const res = await this.flowDB.insertObject({
+      const res = await this.flowDB.insert({
         data: taskInstance,
       }, FLOW_TABLES.flow_instance_task);
       return res.insertId || '';
@@ -169,7 +172,7 @@ export class FlowInstanceCrudService extends BaseService {
     if (flowInstance.id) {
       flowInstance.modified_by = this.getCurrentUserAccountId();
       flowInstance.modified_at = getCurrentDateTime();
-      await this.flowDB.updateObject({
+      await this.flowDB.update({
         condition: {
           id: flowInstance.id,
         },
@@ -179,7 +182,7 @@ export class FlowInstanceCrudService extends BaseService {
     } else {
       flowInstance.created_by = this.getCurrentUserAccountId();
       flowInstance.created_at = getCurrentDateTime();
-      const res = await this.flowDB.insertObject({
+      const res = await this.flowDB.insert({
         data: flowInstance,
       }, FLOW_TABLES.flow_instance);
       return res.insertId || '';
@@ -201,10 +204,10 @@ export class FlowInstanceCrudService extends BaseService {
       throw new Error('flow_instance_id is required');
     }
 
-    const res = await this.flowDB.getUniqueOne({
+    const res = await this.flowDB.findUniqueOne({
       condition: condition,
     }, FLOW_TABLES.flow_instance_node);
-    return res;
+    return res.row as FlowInstanceNode;
   }
 
   public async getFlowInstance(flow_instance_id: number | string | undefined, ticket_no?: number | string | undefined): Promise<FlowInstance> {
@@ -218,10 +221,10 @@ export class FlowInstanceCrudService extends BaseService {
     if (Object.keys(condition).length === 0) {
       throw new Error('flow_instance_id or ticket_no is required');
     }
-    const res = await this.flowDB.getUniqueOne({
+    const res = await this.flowDB.findUniqueOne({
       condition: condition,
     }, FLOW_TABLES.flow_instance);
-    return res;
+    return res.row as FlowInstance;
   }
 
   public async getTaskInstance(task_instance_id: number | string | undefined): Promise<FlowInstanceTask> {
@@ -232,10 +235,10 @@ export class FlowInstanceCrudService extends BaseService {
     if (Object.keys(condition).length === 0) {
       throw new Error('task_instance_id is required');
     }
-    const res = await this.flowDB.getUniqueOne({
+    const res = await this.flowDB.findUniqueOne({
       condition: condition,
     }, FLOW_TABLES.flow_instance_task);
-    return res;
+    return res.row as FlowInstanceTask;
   }
 
   public async getTaskInstanceListByFlowInstanceId(flow_instance_id: number | string | undefined): Promise<FlowInstanceTask[]> {
@@ -246,10 +249,10 @@ export class FlowInstanceCrudService extends BaseService {
     if (Object.keys(condition).length === 0) {
       throw new Error('flow_instance_id is required');
     }
-    const res = await this.flowDB.getList({
+    const res = await this.flowDB.findList({
       condition: condition,
     }, FLOW_TABLES.flow_instance_task);
-    return res;
+    return res.rows as FlowInstanceTask[];
   }
 
 
@@ -261,10 +264,10 @@ export class FlowInstanceCrudService extends BaseService {
     if (Object.keys(condition).length === 0) {
       throw new Error('flowInstanceId is required');
     }
-    const res = await this.flowDB.getList({
+    const res = await this.flowDB.findList({
       condition: condition,
     }, FLOW_TABLES.flow_instance_node);
-    return res;
+    return res.rows as FlowInstanceNode[];
   }