szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/yudao/master-jdk17' into vben5-antd-schema 

# Conflicts:
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/vo/Demo01ContactPageReqVO.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java
This commit is contained in:
puhui999 2025-05-20 16:10:46 +08:00
parent b9ffa1820d 0c68962a97
commit c320b525b5
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,16 +43,16 @@ public class CodegenProperties {
@NotNull(message = "代码生成的 VO 类型不能为空") @NotNull(message = "代码生成的 VO 类型不能为空")
private Integer voType; private Integer voType;
/**
* 是否生成单元测试
*/
@NotNull(message = "是否生成单元测试不能为空")
private Boolean unitTestEnable;
/** /**
* 是否生成批量删除接口 * 是否生成批量删除接口
*/ */
@NotNull(message = "是否生成批量删除接口不能为空") @NotNull(message = "是否生成批量删除接口不能为空")
private Boolean deleteBatchEnable; private Boolean deleteBatchEnable;
/**
* 是否生成单元测试
*/
@NotNull(message = "是否生成单元测试不能为空")
private Boolean unitTestEnable;
} }

1
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/package-info.java
View File

@ -1 +0,0 @@
package cn.iocoder.yudao.module.infra.service.demo.demo03;

1
yudao-module-infra/src/main/resources/codegen/java/dal/do.vm
View File

@ -78,6 +78,7 @@ public class ${table.className}DO extends BaseDO {
#end #end
#end #end
## 特殊：主子表专属逻辑（非 ERP 模式） ## 特殊：主子表专属逻辑（非 ERP 模式）
## TODO @puhui999：这里空行看看，会不会多了一个哈
#if ( $voType == 20 && $subTables && $subTables.size() > 0 && $table.templateType != 11 ) #if ( $voType == 20 && $subTables && $subTables.size() > 0 && $table.templateType != 11 )
#foreach ($subTable in $subTables) #foreach ($subTable in $subTables)
#set ($index = $foreach.count - 1) #set ($index = $foreach.count - 1)

1
yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm
View File

@ -340,6 +340,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
${subClassNameVars.get($index)}Mapper.deleteById(id); ${subClassNameVars.get($index)}Mapper.deleteById(id);
} }
## TODO @puhui999：批量删除的时候，要不直接删除，就不“校验存在”；ps：主子表删除的时候，子表的处理，也要处理下哈；
#if ($deleteBatchEnable) #if ($deleteBatchEnable)
@Override @Override
public void delete${subSimpleClassName}ListByIds(List<${subPrimaryColumn.javaType}> ids) { public void delete${subSimpleClassName}ListByIds(List<${subPrimaryColumn.javaType}> ids) {

2
yudao-server/src/main/resources/application.yaml
View File

@ -270,8 +270,8 @@ yudao:
db-schemas: ${spring.datasource.dynamic.datasource.master.name} db-schemas: ${spring.datasource.dynamic.datasource.master.name}
front-type: 20 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类 front-type: 20 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类
vo-type: 10 # VO 的类型，参见 CodegenVOTypeEnum 枚举类 vo-type: 10 # VO 的类型，参见 CodegenVOTypeEnum 枚举类
delete-batch-enable: true # 是否生成批量删除接口
unit-test-enable: false # 是否生成单元测试 unit-test-enable: false # 是否生成单元测试
delete-batch-enable: false # 是否生成批量删除接口
tenant: # 多租户相关配置项 tenant: # 多租户相关配置项
enable: true enable: true
ignore-urls: ignore-urls: