From c26c4414b4ae037394080dcab4e4bbbc62fcabdc Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 6 Jun 2025 16:35:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20r?= =?UTF-8?q?eview=20todo=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/demo01/Demo01ContactController.java | 2 +- .../erp/Demo03StudentErpController.java | 7 +- .../inner/Demo03StudentInnerController.java | 2 +- .../normal/Demo03StudentNormalController.java | 2 +- .../demo/demo01/Demo01ContactService.java | 2 +- .../demo/demo01/Demo01ContactServiceImpl.java | 2 +- .../demo03/erp/Demo03StudentErpService.java | 6 +- .../erp/Demo03StudentErpServiceImpl.java | 6 +- .../inner/Demo03StudentInnerService.java | 2 +- .../inner/Demo03StudentInnerServiceImpl.java | 2 +- .../normal/Demo03StudentNormalService.java | 2 +- .../Demo03StudentNormalServiceImpl.java | 2 +- .../codegen/java/service/serviceImpl.vm | 9 +- .../vue3_vben5_antd/general/api/api.ts.vm | 93 +++++++++---------- 14 files changed, 71 insertions(+), 68 deletions(-) diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java index 69bf6faaf3..2cfde803b1 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java @@ -65,7 +65,7 @@ public class Demo01ContactController { @Operation(summary = "批量删除示例联系人") @PreAuthorize("@ss.hasPermission('infra:demo01-contact:delete')") public CommonResult deleteDemo0iContactList(@RequestParam("ids") List ids) { - demo01ContactService.deleteDemo0iContactListByIds(ids); + demo01ContactService.deleteDemo0iContactList(ids); return success(true); } diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java index c65f3a7d10..5115409301 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/erp/Demo03StudentErpController.java @@ -67,8 +67,7 @@ public class Demo03StudentErpController { @Operation(summary = "批量删除学生") @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')") public CommonResult deleteDemo03StudentList(@RequestParam("ids") List ids) { - // TODO @puhui999：deleteDemo03StudentList - demo03StudentErpService.deleteDemo03StudentListByIds(ids); + demo03StudentErpService.deleteDemo03StudentList(ids); return success(true); } @@ -142,7 +141,7 @@ public class Demo03StudentErpController { @Operation(summary = "批量删除学生课程") @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')") public CommonResult deleteDemo03CourseList(@RequestParam("ids") List ids) { - demo03StudentErpService.deleteDemo03CourseListByIds(ids); + demo03StudentErpService.deleteDemo03CourseList(ids); return success(true); } @@ -194,7 +193,7 @@ public class Demo03StudentErpController { @Operation(summary = "批量删除学生班级") @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')") public CommonResult deleteDemo03GradeList(@RequestParam("ids") List ids) { - demo03StudentErpService.deleteDemo03GradeListByIds(ids); + demo03StudentErpService.deleteDemo03GradeList(ids); return success(true); } diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java index d76b3a89d0..1a0fb42ae6 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/inner/Demo03StudentInnerController.java @@ -67,7 +67,7 @@ public class Demo03StudentInnerController { @Operation(summary = "批量删除学生") @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')") public CommonResult deleteDemo03StudentList(@RequestParam("ids") List ids) { - demo03StudentInnerService.deleteDemo03StudentListByIds(ids); + demo03StudentInnerService.deleteDemo03StudentList(ids); return success(true); } diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java index e52160ca77..8b3935983f 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/normal/Demo03StudentNormalController.java @@ -67,7 +67,7 @@ public class Demo03StudentNormalController { @Operation(summary = "批量删除学生") @PreAuthorize("@ss.hasPermission('infra:demo03-student:delete')") public CommonResult deleteDemo03StudentList(@RequestParam("ids") List ids) { - demo03StudentNormalService.deleteDemo03StudentListByIds(ids); + demo03StudentNormalService.deleteDemo03StudentList(ids); return success(true); } diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java index 9c1c072afd..8a868c3f74 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactService.java @@ -42,7 +42,7 @@ public interface Demo01ContactService { * * @param ids 编号 */ - void deleteDemo0iContactListByIds(List ids); + void deleteDemo0iContactList(List ids); /** * 获得示例联系人 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java index fb6e19f967..43f828b246 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo01/Demo01ContactServiceImpl.java @@ -55,7 +55,7 @@ public class Demo01ContactServiceImpl implements Demo01ContactService { } @Override - public void deleteDemo0iContactListByIds(List ids) { + public void deleteDemo0iContactList(List ids) { // 校验存在 validateDemo01ContactExists(ids); // 删除 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java index 8a03586206..26c67d9c1d 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpService.java @@ -45,7 +45,7 @@ public interface Demo03StudentErpService { * * @param ids 编号 */ - void deleteDemo03StudentListByIds(List ids); + void deleteDemo03StudentList(List ids); /** * 获得学生 @@ -101,7 +101,7 @@ public interface Demo03StudentErpService { * * @param ids 编号 */ - void deleteDemo03CourseListByIds(List ids); + void deleteDemo03CourseList(List ids); /** * 获得学生课程 @@ -149,7 +149,7 @@ public interface Demo03StudentErpService { * * @param ids 编号 */ - void deleteDemo03GradeListByIds(List ids); + void deleteDemo03GradeList(List ids); /** * 获得学生班级 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java index a8317fd92b..122cb69609 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/erp/Demo03StudentErpServiceImpl.java @@ -71,7 +71,7 @@ public class Demo03StudentErpServiceImpl implements Demo03StudentErpService { @Override @Transactional(rollbackFor = Exception.class) - public void deleteDemo03StudentListByIds(List ids) { + public void deleteDemo03StudentList(List ids) { // 校验存在 validateDemo03StudentExists(ids); // 删除 @@ -134,7 +134,7 @@ public class Demo03StudentErpServiceImpl implements Demo03StudentErpService { } @Override - public void deleteDemo03CourseListByIds(List ids) { + public void deleteDemo03CourseList(List ids) { // 删除 demo03CourseErpMapper.deleteByIds(ids); } @@ -192,7 +192,7 @@ public class Demo03StudentErpServiceImpl implements Demo03StudentErpService { } @Override - public void deleteDemo03GradeListByIds(List ids) { + public void deleteDemo03GradeList(List ids) { // 删除 demo03GradeErpMapper.deleteByIds(ids); } diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerService.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerService.java index 8c616022eb..a2aa684775 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerService.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerService.java @@ -44,7 +44,7 @@ public interface Demo03StudentInnerService { * * @param ids 编号 */ - void deleteDemo03StudentListByIds(List ids); + void deleteDemo03StudentList(List ids); /** * 获得学生 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerServiceImpl.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerServiceImpl.java index 6faf857030..a5008c4bdb 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerServiceImpl.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/inner/Demo03StudentInnerServiceImpl.java @@ -83,7 +83,7 @@ public class Demo03StudentInnerServiceImpl implements Demo03StudentInnerService @Override @Transactional(rollbackFor = Exception.class) - public void deleteDemo03StudentListByIds(List ids) { + public void deleteDemo03StudentList(List ids) { // 校验存在 validateDemo03StudentExists(ids); // 删除 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalService.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalService.java index 5833509ddb..5256855dc6 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalService.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalService.java @@ -44,7 +44,7 @@ public interface Demo03StudentNormalService { * * @param ids 编号 */ - void deleteDemo03StudentListByIds(List ids); + void deleteDemo03StudentList(List ids); /** * 获得学生 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java index ad3a663827..540f7be23f 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/demo/demo03/normal/Demo03StudentNormalServiceImpl.java @@ -83,7 +83,7 @@ public class Demo03StudentNormalServiceImpl implements Demo03StudentNormalServic @Override @Transactional(rollbackFor = Exception.class) - public void deleteDemo03StudentListByIds(List ids) { + public void deleteDemo03StudentList(List ids) { // 校验存在 validateDemo03StudentExists(ids); // 删除 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 edea2e7ab5..d91421a054 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 @@ -65,10 +65,13 @@ public class ${table.className}ServiceImpl implements ${table.className}Service #end // 插入 #if ($voType == 10) -## TODO @puhui999：insert 也要加下 clean。万一前端乱传递，哈哈哈。这个就是 do 模式的缺点；（只在 do 模式下）；看看主子表，是不是也可能存在，insert 的时候； ${table.className}DO ${classNameVar} = BeanUtils.toBean(createReqVO, ${table.className}DO.class); -#end ${classNameVar}Mapper.insert(${classNameVar}); +#else + ${saveReqVOVar}.clean() // 清理掉创建、更新时间等相关属性值 + ${classNameVar}Mapper.insert(${saveReqVOVar}); +#end + ## 特殊：主子表专属逻辑（非 ERP 模式） #if ( $subTables && $subTables.size() > 0 && $table.templateType != 11 ) @@ -112,6 +115,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service ${table.className}DO updateObj = BeanUtils.toBean(updateReqVO, ${table.className}DO.class); ${classNameVar}Mapper.updateById(updateObj); #else + ${updateReqVOVar}.clean() // 清理掉创建、更新时间等相关属性值 ${classNameVar}Mapper.updateById(${updateReqVOVar}); #end ## 特殊：主子表专属逻辑（非 ERP 模式） @@ -320,6 +324,7 @@ public class ${table.className}ServiceImpl implements ${table.className}Service } // 插入 #end + ${subClassNameVar}.clean() // 清理掉创建、更新时间等相关属性值 ${subClassNameVars.get($index)}Mapper.insert(${subClassNameVar}); return ${subClassNameVar}.getId(); } diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm index 0874aa04c8..090b14845b 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm @@ -102,7 +102,6 @@ export function export${simpleClassName}(params: any) { } ## 特殊：主子表专属逻辑 -## TODO @puhui999：下面这块缩进调整了，会乱掉么？ #foreach ($subTable in $subTables) #set ($index = $foreach.count - 1) #set ($subSimpleClassName = $subSimpleClassNames.get($index)) @@ -115,54 +114,54 @@ export function export${simpleClassName}(params: any) { // ==================== 子表（$subTable.classComment） ==================== - ## 情况一：MASTER_ERP 时，需要分查询页子表 - #if ( $table.templateType == 11 ) - /** 获得${subTable.classComment}分页 */ - export function get${subSimpleClassName}Page(params: PageParam) { - return requestClient.get>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params }); - } - ## 情况二：非 MASTER_ERP 时，需要列表查询子表 - #else - #if ( $subTable.subJoinMany ) - /** 获得${subTable.classComment}列表 */ - export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) { - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`); - } - #else - /** 获得${subTable.classComment} */ - export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) { - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`); - } - #end - #end - ## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作 - #if ( $table.templateType == 11 ) - /** 新增${subTable.classComment} */ - export function create${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) { - return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data); - } +## 情况一：MASTER_ERP 时，需要分查询页子表 +#if ( $table.templateType == 11 ) +/** 获得${subTable.classComment}分页 */ +export function get${subSimpleClassName}Page(params: PageParam) { + return requestClient.get>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params }); +} + ## 情况二：非 MASTER_ERP 时，需要列表查询子表 +#else +#if ( $subTable.subJoinMany ) +/** 获得${subTable.classComment}列表 */ +export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) { + return requestClient.get<${simpleClassName}Api.${subSimpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`); +} +#else +/** 获得${subTable.classComment} */ +export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) { + return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`); +} +#end +#end +## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作 +#if ( $table.templateType == 11 ) +/** 新增${subTable.classComment} */ +export function create${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) { + return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data); +} - /** 修改${subTable.classComment} */ - export function update${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) { - return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data); - } +/** 修改${subTable.classComment} */ +export function update${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) { + return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data); +} - /** 删除${subTable.classComment} */ - export function delete${subSimpleClassName}(id: number) { - return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`); - } +/** 删除${subTable.classComment} */ +export function delete${subSimpleClassName}(id: number) { + return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete?id=${id}`); +} - #if ($deleteBatchEnable) - /** 批量删除${subTable.classComment} */ - export function delete${subSimpleClassName}List(ids: number[]) { - return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete-list?ids=${ids.join(',')}`) - } - #end - - /** 获得${subTable.classComment} */ - export function get${subSimpleClassName}(id: number) { - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`); - } - #end +#if ($deleteBatchEnable) +/** 批量删除${subTable.classComment} */ +export function delete${subSimpleClassName}List(ids: number[]) { + return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete-list?ids=${ids.join(',')}`) +} +#end + +/** 获得${subTable.classComment} */ +export function get${subSimpleClassName}(id: number) { + return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`); +} +#end #end