BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c320b525b5c2945f6c9f7b4787763a12d32f1432

Authored by puhui999
2 parents b9ffa182 0c68962a

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
Inline Side-by-side
Showing 5 changed files with 9 additions and 8 deletions
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/codegen/config/CodegenProperties.java
  View file @c320b52
... ... @@ -44,15 +44,15 @@ public class CodegenProperties {
44 44 private Integer voType;
45 45  
46 46 /**
47   - * 是否生成单元测试
48   - */
49   - @NotNull(message = "是否生成单元测试不能为空")
50   - private Boolean unitTestEnable;
51   -
52   - /**
53 47 * 是否生成批量删除接口
54 48 */
55 49 @NotNull(message = "是否生成批量删除接口不能为空")
56 50 private Boolean deleteBatchEnable;
57 51  
  52 + /**
  53 + * 是否生成单元测试
  54 + */
  55 + @NotNull(message = "是否生成单元测试不能为空")
  56 + private Boolean unitTestEnable;
  57 +
58 58 }
... ...
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/package-info.java deleted
View file @b9ffa18
1   -package cn.iocoder.yudao.module.infra.service.demo.demo03;
2 0 \ No newline at end of file
yudao-module-infra/src/main/resources/codegen/java/dal/do.vm
  View file @c320b52
... ... @@ -78,6 +78,7 @@ public class ${table.className}DO extends BaseDO {
78 78 #end
79 79 #end
80 80 ## 特殊：主子表专属逻辑（非 ERP 模式）
  81 +## TODO @puhui999：这里空行看看，会不会多了一个哈
81 82 #if ( $voType == 20 && $subTables && $subTables.size() > 0 && $table.templateType != 11 )
82 83 #foreach ($subTable in $subTables)
83 84 #set ($index = $foreach.count - 1)
... ...
yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm
  View file @c320b52
... ... @@ -340,6 +340,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service
340 340 ${subClassNameVars.get($index)}Mapper.deleteById(id);
341 341 }
342 342  
  343 +## TODO @puhui999：批量删除的时候，要不直接删除，就不“校验存在”；ps：主子表删除的时候，子表的处理，也要处理下哈；
343 344 #if ($deleteBatchEnable)
344 345 @Override
345 346 public void delete${subSimpleClassName}ListByIds(List<${subPrimaryColumn.javaType}> ids) {
... ...
yudao-server/src/main/resources/application.yaml
  View file @c320b52
... ... @@ -270,8 +270,8 @@ yudao:
270 270 db-schemas: ${spring.datasource.dynamic.datasource.master.name}
271 271 front-type: 20 # 前端模版的类型，参见 CodegenFrontTypeEnum 枚举类
272 272 vo-type: 10 # VO 的类型，参见 CodegenVOTypeEnum 枚举类
  273 + delete-batch-enable: true # 是否生成批量删除接口
273 274 unit-test-enable: false # 是否生成单元测试
274   - delete-batch-enable: false # 是否生成批量删除接口
275 275 tenant: # 多租户相关配置项
276 276 enable: true
277 277 ignore-urls:
... ...