From 61cfcc283b426dd69e3f479a5600be3c6e1f382b Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 19 May 2025 23:52:58 +0800 Subject: [PATCH] =?UTF-8?q?perf:=E3=80=90INFRA=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=E3=80=91=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20delete-batch-enable:=20false=20#=20?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=94=9F=E6=88=90=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/codegen/vo/table/CodegenTableRespVO.java | 4 ---- .../admin/codegen/vo/table/CodegenTableSaveReqVO.java | 4 ---- .../infra/dal/dataobject/codegen/CodegenTableDO.java | 6 ------ .../framework/codegen/config/CodegenProperties.java | 6 ++++++ .../infra/service/codegen/inner/CodegenEngine.java | 2 +- .../resources/codegen/java/controller/controller.vm | 4 ++-- .../src/main/resources/codegen/java/dal/mapper_sub.vm | 2 +- .../src/main/resources/codegen/java/service/service.vm | 4 ++-- .../main/resources/codegen/java/service/serviceImpl.vm | 8 ++++---- .../codegen/vue3_vben5_antd/schema/api/api.ts.vm | 4 ++-- .../codegen/vue3_vben5_antd/schema/views/data.ts.vm | 4 ++-- .../codegen/vue3_vben5_antd/schema/views/index.vue.vm | 10 +++++----- .../schema/views/modules/list_sub_erp.vue.vm | 8 ++++---- yudao-server/src/main/resources/application.yaml | 1 + 14 files changed, 30 insertions(+), 37 deletions(-) diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java index a8a8fe108f..8b438b2da6 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.infra.controller.admin.codegen.vo.table; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.time.LocalDateTime; @@ -46,9 +45,6 @@ public class CodegenTableRespVO { @Schema(description = "前端类型，参见 CodegenFrontTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "20") private Integer frontType; - @Schema(description = "是否生成批量删除接口", example = "true") - private Boolean deleteBatch; - @Schema(description = "父菜单编号", example = "1024") private Long parentMenuId; diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java index 1fa2ba9278..201d94d2e2 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java @@ -60,10 +60,6 @@ public class CodegenTableSaveReqVO { @NotNull(message = "前端类型不能为空") private Integer frontType; - @Schema(description = "是否生成批量删除接口", example = "true") - @NotNull(message = "是否生成批量删除接口不能为空") - private Boolean deleteBatch; - @Schema(description = "父菜单编号", example = "1024") private Long parentMenuId; diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java index d8aa79b66a..b46cbe4fef 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java @@ -108,12 +108,6 @@ public class CodegenTableDO extends BaseDO { * 枚举 {@link CodegenFrontTypeEnum} */ private Integer frontType; - /** - * 是否生成批量删除接口 - * -true 是 - * -false 否 - */ - private Boolean deleteBatch; // ========== 菜单相关字段 ========== diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java index cfa1fa2fbe..3ff03b3d4a 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java @@ -40,4 +40,10 @@ public class CodegenProperties { @NotNull(message = "是否生成单元测试不能为空") private Boolean unitTestEnable; + /** + * 是否生成批量删除接口 + */ + @NotNull(message = "是否生成批量删除接口不能为空") + private Boolean deleteBatchEnable; + } diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java index bce07e0c1d..2d2a920551 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java @@ -380,7 +380,7 @@ public class CodegenEngine { bindingMap.put("columns", columns); bindingMap.put("primaryColumn", CollectionUtils.findFirst(columns, CodegenColumnDO::getPrimaryKey)); // 主键字段 bindingMap.put("sceneEnum", CodegenSceneEnum.valueOf(table.getScene())); - + bindingMap.put("deleteBatchEnable", codegenProperties.getDeleteBatchEnable()); // className 相关 // 去掉指定前缀，将 TestDictType 转换成 DictType. 因为在 create 等方法后，不需要带上 Test 前缀 String simpleClassName = equalsAnyIgnoreCase(table.getClassName(), table.getModuleName()) ? table.getClassName() diff --git a/yudao-module-infra/src/main/resources/codegen/java/controller/controller.vm b/yudao-module-infra/src/main/resources/codegen/java/controller/controller.vm index 36d860f7e9..d94eeaaf30 100644 --- a/yudao-module-infra/src/main/resources/codegen/java/controller/controller.vm +++ b/yudao-module-infra/src/main/resources/codegen/java/controller/controller.vm @@ -74,7 +74,7 @@ public class ${sceneEnum.prefixClass}${table.className}Controller { return success(true); } -#if ( $table.templateType != 2 && $table.deleteBatch) +#if ( $table.templateType != 2 && $deleteBatchEnable) @DeleteMapping("/delete-batch") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除${table.classComment}") @@ -231,7 +231,7 @@ public class ${sceneEnum.prefixClass}${table.className}Controller { return success(true); } -#if ($table.deleteBatch) +#if ($deleteBatchEnable) @DeleteMapping("/${subSimpleClassName_strikeCase}/delete-batch") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除${subTable.classComment}") diff --git a/yudao-module-infra/src/main/resources/codegen/java/dal/mapper_sub.vm b/yudao-module-infra/src/main/resources/codegen/java/dal/mapper_sub.vm index 88d1cd0745..950000ce0a 100644 --- a/yudao-module-infra/src/main/resources/codegen/java/dal/mapper_sub.vm +++ b/yudao-module-infra/src/main/resources/codegen/java/dal/mapper_sub.vm @@ -54,7 +54,7 @@ public interface ${subTable.className}Mapper extends BaseMapperX<${subTable.clas return delete(${subTable.className}DO::get${SubJoinColumnName}, ${subJoinColumn.javaField}); } -#if ( $table.templateType != 2 && $table.deleteBatch) +#if ( $table.templateType != 2 && $deleteBatchEnable) default int deleteBy${SubJoinColumnName}s(List<${subJoinColumn.javaType}> ${subJoinColumn.javaField}s) { return delete(${subTable.className}DO::get${SubJoinColumnName}, ${subJoinColumn.javaField}s); } diff --git a/yudao-module-infra/src/main/resources/codegen/java/service/service.vm b/yudao-module-infra/src/main/resources/codegen/java/service/service.vm index 6770138c20..37471365f7 100644 --- a/yudao-module-infra/src/main/resources/codegen/java/service/service.vm +++ b/yudao-module-infra/src/main/resources/codegen/java/service/service.vm @@ -40,7 +40,7 @@ public interface ${table.className}Service { */ void delete${simpleClassName}(${primaryColumn.javaType} id); -#if ( $table.templateType != 2 && $table.deleteBatch) +#if ( $table.templateType != 2 && $deleteBatchEnable) /** * 批量删除${table.classComment} * @@ -143,7 +143,7 @@ public interface ${table.className}Service { */ void delete${subSimpleClassName}(${subPrimaryColumn.javaType} id); -#if ($table.deleteBatch) +#if ($deleteBatchEnable) /** * 批量删除${subTable.classComment} * diff --git a/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm b/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm index 347049ecaf..1d7baa9629 100644 --- a/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm +++ b/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm @@ -155,7 +155,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service #end } -#if ( $table.templateType != 2 && $table.deleteBatch) +#if ( $table.templateType != 2 && $deleteBatchEnable) @Override ## 特殊：主子表专属逻辑 #if ( $subTables && $subTables.size() > 0) @@ -332,7 +332,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service ${subClassNameVars.get($index)}Mapper.deleteById(id); } -#if ($table.deleteBatch) +#if ($deleteBatchEnable) @Override public void delete${subSimpleClassName}ByIds(List<${subPrimaryColumn.javaType}> ids) { // 校验存在 @@ -353,7 +353,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service } } -#if ($table.deleteBatch) +#if ($deleteBatchEnable) private void validate${subSimpleClassName}Exists(List<${subPrimaryColumn.javaType}> ids) { List<${subTable.className}DO> list = ${subClassNameVar}Mapper.selectByIds(ids); if (CollUtil.isEmpty(list) || list.size() != ids.size()) { @@ -400,7 +400,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service ${subClassNameVars.get($index)}Mapper.deleteBy${SubJoinColumnName}(${subJoinColumn.javaField}); } -#if ( $table.templateType != 2 && $table.deleteBatch) +#if ( $table.templateType != 2 && $deleteBatchEnable) private void delete${subSimpleClassName}By${SubJoinColumnName}s(List<${primaryColumn.javaType}> ${subJoinColumn.javaField}s) { ${subClassNameVars.get($index)}Mapper.deleteBy${SubJoinColumnName}s(${subJoinColumn.javaField}s); } diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm index 330a18ae18..4bf8148c94 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm @@ -89,7 +89,7 @@ export function delete${simpleClassName}(id: number) { return requestClient.delete(`${baseURL}/delete?id=${id}`); } -#if ( $table.templateType != 2 && $table.deleteBatch) +#if ( $table.templateType != 2 && $deleteBatchEnable) // 批量删除${table.classComment} export function delete${simpleClassName}ByIds(ids: number[]) { return requestClient.delete(`${baseURL}/delete-batch?ids=${ids.join(',')}`) @@ -151,7 +151,7 @@ export function delete${subSimpleClassName}(id: number) { return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`); } -#if ($table.deleteBatch) +#if ($deleteBatchEnable) // 批量删除${subTable.classComment} export function delete${subSimpleClassName}ByIds(ids: number[]) { return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete-batch?ids=${ids.join(',')}`) diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm index 28039ea3b3..46c19d96d5 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/data.ts.vm @@ -193,7 +193,7 @@ export function useGridColumns( onActionClick?: OnActionClickFn<${simpleClassName}Api.${simpleClassName}>, ): VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>['columns'] { return [ -#if ($table.templateType != 2 && $table.deleteBatch) +#if ($table.templateType != 2 && $deleteBatchEnable) { type: 'checkbox', width: 40 }, #end #if ($table.templateType == 12) ## 内嵌情况 @@ -431,7 +431,7 @@ export function use${subSimpleClassName}GridColumns( onActionClick?: OnActionClickFn<${simpleClassName}Api.${subSimpleClassName}>, ): VxeTableGridOptions<${simpleClassName}Api.${subSimpleClassName}>['columns'] { return [ - #if ($table.templateType != 2 && $table.deleteBatch) + #if ($table.templateType != 2 && $deleteBatchEnable) { type: 'checkbox', width: 40 }, #end #foreach($column in $subColumns) diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm index 4a4be13fc6..d0ae6e770e 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm @@ -22,7 +22,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table'; #if (${table.templateType} == 2)## 树表接口 import { get${simpleClassName}List, delete${simpleClassName}, export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}'; #else## 标准表接口 -import { get${simpleClassName}Page, delete${simpleClassName},#if ($table.deleteBatch) delete${simpleClassName}ByIds,#end export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}'; +import { get${simpleClassName}Page, delete${simpleClassName},#if ($deleteBatchEnable) delete${simpleClassName}ByIds,#end export${simpleClassName} } from '#/api/${table.moduleName}/${table.businessName}'; #end import { downloadFileFromBlobPart, isEmpty } from '@vben/utils'; @@ -92,7 +92,7 @@ async function onDelete(row: ${simpleClassName}Api.${simpleClassName}) { } } -#if ($table.templateType != 2 && $table.deleteBatch) +#if ($table.templateType != 2 && $deleteBatchEnable) const deleteIds = ref([]) // 待删除${table.classComment} ID const showDeleteBatchBtn = computed(() => isEmpty(deleteIds.value)); function setDeleteIds({ @@ -204,14 +204,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ search: true, }, } as VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>, -#if (${table.templateType} == 11 || $table.deleteBatch) +#if (${table.templateType} == 11 || $deleteBatchEnable) gridEvents:{ #if(${table.templateType} == 11) cellClick: ({ row }: { row: ${simpleClassName}Api.${simpleClassName}}) => { select${simpleClassName}.value = row; }, #end - #if($table.deleteBatch) + #if($deleteBatchEnable) checkboxAll: setDeleteIds, checkboxChange: setDeleteIds, #end @@ -262,7 +262,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ > {{ $t('ui.actionTitle.export') }} -#if ($table.templateType != 2 && $table.deleteBatch) +#if ($table.templateType != 2 && $deleteBatchEnable) - #if ($table.templateType == 11 && $table.deleteBatch) + #if ($table.templateType == 11 && $deleteBatchEnable)