From c8acf583b9055e306f21c7275a22c5c47408b4d0 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Sun, 7 Jun 2026 12:50:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(api):=20=E5=AF=B9=E9=BD=90=20infra=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=89=8D=E7=AB=AF=20API=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8E=E5=90=8E=E7=AB=AF=20VO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复类型不匹配: - codegen: CodegenColumn 6个 Boolean 字段 number→boolean - codegen: 添加 frontType/masterTableId/subJoinColumnId/subJoinMany/treeParentColumnId/treeNameColumnId - codegen: 删除多余 tableId/isParentMenuIdValid, dataSourceConfigId 改为必填 - job-log: executeIndex/duration string→number, beginTime/endTime Date→string - job-log: 删除多余 cronExpression 统一时间字段类型 Date→string: - config/data-source-config/file/file-config/job/codegen 补充缺失字段: - codegen.column: 添加 createTime - demo01/demo02/demo03: 添加 createTime 删除未使用的多余字段: - api-error-log: 删除 resultCode - file-config: 删除 visible --- .../src/api/infra/api-error-log/index.ts | 1 - apps/web-antd/src/api/infra/codegen/index.ts | 27 +++++++++++-------- apps/web-antd/src/api/infra/config/index.ts | 2 +- .../src/api/infra/data-source-config/index.ts | 2 +- .../src/api/infra/demo/demo01/index.ts | 1 + .../src/api/infra/demo/demo02/index.ts | 1 + .../src/api/infra/demo/demo03/erp/index.ts | 1 + .../src/api/infra/demo/demo03/inner/index.ts | 1 + .../src/api/infra/demo/demo03/normal/index.ts | 1 + .../src/api/infra/file-config/index.ts | 3 +-- apps/web-antd/src/api/infra/file/index.ts | 2 +- apps/web-antd/src/api/infra/job-log/index.ts | 9 +++---- apps/web-antd/src/api/infra/job/index.ts | 2 +- 13 files changed, 30 insertions(+), 23 deletions(-) diff --git a/apps/web-antd/src/api/infra/api-error-log/index.ts b/apps/web-antd/src/api/infra/api-error-log/index.ts index 863f73e9b..835df590a 100644 --- a/apps/web-antd/src/api/infra/api-error-log/index.ts +++ b/apps/web-antd/src/api/infra/api-error-log/index.ts @@ -27,7 +27,6 @@ export namespace InfraApiErrorLogApi { processUserId: number; processStatus: number; processTime: string; - resultCode: number; createTime: string; } } diff --git a/apps/web-antd/src/api/infra/codegen/index.ts b/apps/web-antd/src/api/infra/codegen/index.ts index 992d41d2d..c02026e0b 100644 --- a/apps/web-antd/src/api/infra/codegen/index.ts +++ b/apps/web-antd/src/api/infra/codegen/index.ts @@ -6,8 +6,6 @@ export namespace InfraCodegenApi { /** 代码生成表定义 */ export interface CodegenTable { id: number; - tableId: number; - isParentMenuIdValid: boolean; dataSourceConfigId: number; scene: number; tableName: string; @@ -18,10 +16,16 @@ export namespace InfraCodegenApi { className: string; classComment: string; author: string; - createTime: Date; - updateTime: Date; templateType: number; parentMenuId: number; + frontType: number; + masterTableId: number; + subJoinColumnId: number; + subJoinMany: boolean; + treeParentColumnId: number; + treeNameColumnId: number; + createTime: string; + updateTime: string; } /** 代码生成字段定义 */ @@ -31,19 +35,20 @@ export namespace InfraCodegenApi { columnName: string; dataType: string; columnComment: string; - nullable: number; - primaryKey: number; + nullable: boolean; + primaryKey: boolean; ordinalPosition: number; javaType: string; javaField: string; dictType: string; example: string; - createOperation: number; - updateOperation: number; - listOperation: number; + createOperation: boolean; + updateOperation: boolean; + listOperation: boolean; listOperationCondition: string; - listOperationResult: number; + listOperationResult: boolean; htmlType: string; + createTime: string; } /** 数据库表定义 */ @@ -72,7 +77,7 @@ export namespace InfraCodegenApi { /** 创建代码生成请求 */ export interface CodegenCreateListReqVO { - dataSourceConfigId?: number; + dataSourceConfigId: number; tableNames: string[]; } } diff --git a/apps/web-antd/src/api/infra/config/index.ts b/apps/web-antd/src/api/infra/config/index.ts index aa80bcbed..e93d64e32 100644 --- a/apps/web-antd/src/api/infra/config/index.ts +++ b/apps/web-antd/src/api/infra/config/index.ts @@ -13,7 +13,7 @@ export namespace InfraConfigApi { type: number; visible: boolean; remark: string; - createTime?: Date; + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/data-source-config/index.ts b/apps/web-antd/src/api/infra/data-source-config/index.ts index 81a3b0e3d..3b58037fc 100644 --- a/apps/web-antd/src/api/infra/data-source-config/index.ts +++ b/apps/web-antd/src/api/infra/data-source-config/index.ts @@ -8,7 +8,7 @@ export namespace InfraDataSourceConfigApi { url: string; username: string; password: string; - createTime?: Date; + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/demo/demo01/index.ts b/apps/web-antd/src/api/infra/demo/demo01/index.ts index e180a76c4..d22f9e9cc 100644 --- a/apps/web-antd/src/api/infra/demo/demo01/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo01/index.ts @@ -13,6 +13,7 @@ export namespace Demo01ContactApi { birthday?: Dayjs | string; // 出生年 description?: string; // 简介 avatar: string; // 头像 + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/demo/demo02/index.ts b/apps/web-antd/src/api/infra/demo/demo02/index.ts index b4edd746e..198b744f4 100644 --- a/apps/web-antd/src/api/infra/demo/demo02/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo02/index.ts @@ -7,6 +7,7 @@ export namespace Demo02CategoryApi { name?: string; // 名字 parentId?: number; // 父级编号 children?: Demo02Category[]; + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts index 6dc7e352a..60e2ad022 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts @@ -28,6 +28,7 @@ export namespace Demo03StudentApi { sex?: number; // 性别 birthday?: Dayjs | string; // 出生日期 description?: string; // 简介 + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts b/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts index 02bfbcc66..5ef682ce8 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts @@ -30,6 +30,7 @@ export namespace Demo03StudentApi { description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts index 2a085a153..6ab987ade 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts @@ -30,6 +30,7 @@ export namespace Demo03StudentApi { description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/file-config/index.ts b/apps/web-antd/src/api/infra/file-config/index.ts index 3b1e82e6c..0185c3010 100644 --- a/apps/web-antd/src/api/infra/file-config/index.ts +++ b/apps/web-antd/src/api/infra/file-config/index.ts @@ -27,10 +27,9 @@ export namespace InfraFileConfigApi { name: string; storage?: number; master: boolean; - visible: boolean; config: FileClientConfig; remark: string; - createTime?: Date; + createTime?: string; } } diff --git a/apps/web-antd/src/api/infra/file/index.ts b/apps/web-antd/src/api/infra/file/index.ts index edf06933b..2dc6b51e6 100644 --- a/apps/web-antd/src/api/infra/file/index.ts +++ b/apps/web-antd/src/api/infra/file/index.ts @@ -15,7 +15,7 @@ export namespace InfraFileApi { url?: string; size?: number; type?: string; - createTime?: Date; + createTime?: string; } /** 文件预签名地址 */ diff --git a/apps/web-antd/src/api/infra/job-log/index.ts b/apps/web-antd/src/api/infra/job-log/index.ts index e115b9df7..0fb9dcef0 100644 --- a/apps/web-antd/src/api/infra/job-log/index.ts +++ b/apps/web-antd/src/api/infra/job-log/index.ts @@ -9,11 +9,10 @@ export namespace InfraJobLogApi { jobId: number; handlerName: string; handlerParam: string; - cronExpression: string; - executeIndex: string; - beginTime: Date; - endTime: Date; - duration: string; + executeIndex: number; + beginTime: string; + endTime: string; + duration: number; status: number; createTime?: string; result: string; diff --git a/apps/web-antd/src/api/infra/job/index.ts b/apps/web-antd/src/api/infra/job/index.ts index 04848dd8b..d32248953 100644 --- a/apps/web-antd/src/api/infra/job/index.ts +++ b/apps/web-antd/src/api/infra/job/index.ts @@ -14,7 +14,7 @@ export namespace InfraJobApi { retryCount: number; retryInterval: number; monitorTimeout: number; - createTime?: Date; + createTime?: string; nextTimes?: Date[]; } }