From f95dc4d947f81534d017a8205797c9f14d211612 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sun, 1 Jun 2025 19:42:07 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E7=94=9F=E6=88=90=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/bunny/service/impl/VmsServiceImpl.java | 17 +++++------- .../vms/server/controller/controller.java.vm | 26 +++++++++---------- .../vms/server/mapper/mapper.java.vm | 6 ----- .../vms/server/mapper/resourceMapper.xml.vm | 9 ------- .../src/main/resources/vms/web/hook.tsx.vm | 4 +-- .../src/main/resources/vms/web/store.ts.vm | 2 +- .../src/main/resources/vms/web/types.ts.vm | 4 +-- 7 files changed, 25 insertions(+), 43 deletions(-) diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java index f18341f..8791a3d 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/VmsServiceImpl.java @@ -52,17 +52,14 @@ public class VmsServiceImpl implements VmsService { String sql = dto.getSql(); // 表格属性名 和 列信息 - TableMetaData tableMetaData; - List columnInfoList; + TableMetaData tableMetaData = StringUtils.hasText(dto.getSql()) + ? sqlParserDatabaseInfo.getTableMetadata(dto.getSql()) + : databaseInfoCore.getTableMetadata(dto.getTableName()); + + List columnInfoList = StringUtils.hasText(sql) + ? sqlParserDatabaseInfo.tableColumnInfo(sql) + : databaseInfoCore.tableColumnInfo(tableName).stream().distinct().toList(); - // 判断是否有 SQL 如果有SQL 优先解析并生成SQL相关内容 - if (StringUtils.hasText(sql)) { - tableMetaData = sqlParserDatabaseInfo.getTableMetadata(sql); - columnInfoList = sqlParserDatabaseInfo.tableColumnInfo(sql); - } else { - tableMetaData = databaseInfoCore.getTableMetadata(tableName); - columnInfoList = databaseInfoCore.tableColumnInfo(tableName).stream().distinct().toList(); - } return dto.getPath().stream().map(path -> { // 生成模板 diff --git a/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm b/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm index c37c4ad..0824fe6 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/server/controller/controller.java.vm @@ -21,42 +21,42 @@ import java.util.List; * @author ${author} * @since ${date} */ -@Tag(name = "${comment}", description = "${comment}相关接口") +@Tag(name = "${comment}" , description = "${comment}相关接口" ) @RestController -@RequestMapping("${requestMapping}/${classLowercaseName}") +@RequestMapping("${requestMapping}/${classLowercaseName}" ) public class ${classUppercaseName}Controller { @Resource private ${classUppercaseName}Service ${classLowercaseName}Service; - @Operation(summary = "分页查询${comment}", description = "分页${comment}", tags = "${classLowercaseName}::query") - @GetMapping("{page}/{limit}") + @Operation(summary = "分页查询${comment}" , description = "分页${comment}" ) + @GetMapping("{page}/{limit}" ) public Result> get${classUppercaseName}Page( - @Parameter(name = "page", description = "当前页", required = true) - @PathVariable("page") Integer page, - @Parameter(name = "limit", description = "每页记录数", required = true) - @PathVariable("limit") Integer limit, + @Parameter(name = "page" , description = "当前页" , required = true) + @PathVariable("page" ) Integer page, + @Parameter(name = "limit" , description = "每页记录数" , required = true) + @PathVariable("limit" ) Integer limit, ${classUppercaseName}Dto dto) { Page<${classUppercaseName}> pageParams = new Page<>(page, limit); PageResult<${classUppercaseName}Vo> pageResult = ${classLowercaseName}Service.get${classUppercaseName}Page(pageParams, dto); return Result.success(pageResult); } - @Operation(summary = "添加${comment}", description = "添加${comment}", tags = "${classLowercaseName}::add") + @Operation(summary = "添加${comment}" , description = "添加${comment}" ) @PostMapping() - public Result add${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}AddDto dto) { + public Result add${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}to dto) { ${classLowercaseName}Service.add${classUppercaseName}(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } - @Operation(summary = "更新${comment}", description = "更新${comment}", tags = "${classLowercaseName}::update") + @Operation(summary = "更新${comment}" , description = "更新${comment}" ) @PutMapping() - public Result update${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}UpdateDto dto) { + public Result update${classUppercaseName}(@Valid @RequestBody ${classUppercaseName}Dto dto) { ${classLowercaseName}Service.update${classUppercaseName}(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } - @Operation(summary = "删除${comment}", description = "删除${comment}", tags = "${classLowercaseName}::delete") + @Operation(summary = "删除${comment}" , description = "删除${comment}" ) @DeleteMapping() public Result delete${classUppercaseName}(@RequestBody List ids) { ${classLowercaseName}Service.delete${classUppercaseName}(ids); diff --git a/generator-code-server/generator-code/src/main/resources/vms/server/mapper/mapper.java.vm b/generator-code-server/generator-code/src/main/resources/vms/server/mapper/mapper.java.vm index 21d8b89..72ac003 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/server/mapper/mapper.java.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/server/mapper/mapper.java.vm @@ -27,10 +27,4 @@ public interface ${classUppercaseName}Mapper extends BaseMapper<${classUppercase */ IPage<${classUppercaseName}Vo> selectListByPage(@Param("page" ) Page<${classUppercaseName}> pageParams, @Param("dto" ) ${classUppercaseName}Dto dto); - /** - * 物理删除${comment} - * - * @param ids 删除 id 列表 - */ - void deleteBatchIdsWithPhysics(List ids); } diff --git a/generator-code-server/generator-code/src/main/resources/vms/server/mapper/resourceMapper.xml.vm b/generator-code-server/generator-code/src/main/resources/vms/server/mapper/resourceMapper.xml.vm index c7619b8..6f9fef6 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/server/mapper/resourceMapper.xml.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/server/mapper/resourceMapper.xml.vm @@ -33,13 +33,4 @@ - - - delete from ${tableName} - where id in - - #{id} - - - diff --git a/generator-code-server/generator-code/src/main/resources/vms/web/hook.tsx.vm b/generator-code-server/generator-code/src/main/resources/vms/web/hook.tsx.vm index 5315fe3..021928d 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/web/hook.tsx.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/web/hook.tsx.vm @@ -23,7 +23,7 @@ export function onAdd() { props: { formInline: { #foreach($item in $columnInfoList) - $!{item.fieldName}: undefined, + $!{item.columnName}: undefined, #end }, }, @@ -53,7 +53,7 @@ export function onUpdate(row: any) { props: { formInline: { #foreach($item in $columnInfoList) - $!{item.fieldName}: row.$!{item.fieldName}, + $!{item.columnName}: row.$!{item.fieldName}, #end } }, diff --git a/generator-code-server/generator-code/src/main/resources/vms/web/store.ts.vm b/generator-code-server/generator-code/src/main/resources/vms/web/store.ts.vm index a25b94e..f99602c 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/web/store.ts.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/web/store.ts.vm @@ -16,7 +16,7 @@ export const use${classUppercaseName}Store = defineStore('${lowercaseName}Store' form: { #foreach($item in $columnInfoList) // $!{item.comment} - $!{item.fieldName}: undefined, + $!{item.columnName}: undefined, #end }, // 分页查询结果 diff --git a/generator-code-server/generator-code/src/main/resources/vms/web/types.ts.vm b/generator-code-server/generator-code/src/main/resources/vms/web/types.ts.vm index 7aa698b..23b2b29 100644 --- a/generator-code-server/generator-code/src/main/resources/vms/web/types.ts.vm +++ b/generator-code-server/generator-code/src/main/resources/vms/web/types.ts.vm @@ -3,9 +3,9 @@ export interface FormItemProps { #foreach($field in $columnInfoList) // $field.comment #if($field.javascriptType == "object") - $field.fieldName: any + $field.columnName: any #else - $field.fieldName: $field.javascriptType + $field.columnName: $field.javascriptType #end #end }