sion/sionrui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/vben5-antd-schema' into vben5-antd-schema

Browse Source
This commit is contained in:
puhui999
2025-05-20 09:57:46 +08:00
parent 3e3dbce047 61cfcc283b
commit 15e2121078
14 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java
View File

@@ -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;

4
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java
View File

@@ -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;

6
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenTableDO.java
View File

@@ -108,12 +108,6 @@ public class CodegenTableDO extends BaseDO {
* 枚举 {@link CodegenFrontTypeEnum}
*/
private Integer frontType;
/**
* 是否生成批量删除接口
* -true 是
* -false 否
*/
private Boolean deleteBatch;
// ========== 菜单相关字段 ==========

6
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java
View File

@@ -49,4 +49,10 @@ public class CodegenProperties {
@NotNull(message = "是否生成单元测试不能为空")
private Boolean unitTestEnable;
/**
* 是否生成批量删除接口
*/
@NotNull(message = "是否生成批量删除接口不能为空")
private Boolean deleteBatchEnable;
}

2
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
View File

@@ -382,7 +382,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 className = table.getClassName();