From e47acc4651496306090913d0b9ac23b92de8da90 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sat, 5 Jul 2025 23:23:49 +0800 Subject: [PATCH] =?UTF-8?q?:speech=5Fballoon:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF;?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/template/VmsTBaseTemplateGenerator.java | 11 +++++++---- .../vms/server/controller/controller.java.vm | 4 +++- src/main/resources/vms/server/domain/dto/dto.java.vm | 8 ++++++-- .../resources/vms/server/domain/entity/entity.java.vm | 5 ++++- src/main/resources/vms/server/domain/vo/vo.java.vm | 9 +++++++-- src/main/resources/vms/server/mapper/mapper.java.vm | 4 +++- .../vms/server/service/impl/serviceImpl.java.vm | 4 +++- src/main/resources/vms/server/service/service.java.vm | 4 +++- 8 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java b/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java index f956944..6322f6f 100644 --- a/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java +++ b/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java @@ -7,6 +7,7 @@ import com.google.common.base.CaseFormat; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; +import org.springframework.util.StringUtils; import java.io.StringWriter; import java.text.SimpleDateFormat; @@ -28,10 +29,6 @@ public class VmsTBaseTemplateGenerator extends AbstractTemplateGenerator { * @param tableMetaData 表名称 */ public VmsTBaseTemplateGenerator(VmsArgumentDto dto, String path, TableMetaData tableMetaData) { - this.dto = dto; - this.path = path; - this.tableMetaData = tableMetaData; - // 处理表名称，替换前缀 String tableName = tableMetaData.getTableName(); String[] prefixes = dto.getTablePrefixes().split("[,，]"); @@ -41,6 +38,11 @@ public class VmsTBaseTemplateGenerator extends AbstractTemplateGenerator { tableMetaData.setCleanTableName(handlerTableName); } } + + this.dto = dto; + this.path = path; + this.tableMetaData = tableMetaData; + } /** @@ -52,6 +54,7 @@ public class VmsTBaseTemplateGenerator extends AbstractTemplateGenerator { public void addContext(VelocityContext context) { // 当前的表名 String handlerTableName = tableMetaData.getCleanTableName(); + handlerTableName = StringUtils.hasText(handlerTableName) ? handlerTableName : tableMetaData.getTableName(); // 表的注释内容 String comment = tableMetaData.getComment(); diff --git a/src/main/resources/vms/server/controller/controller.java.vm b/src/main/resources/vms/server/controller/controller.java.vm index d0867b7..c1af1df 100644 --- a/src/main/resources/vms/server/controller/controller.java.vm +++ b/src/main/resources/vms/server/controller/controller.java.vm @@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import ${package}.service.${classUppercaseName}Service; - +import ${package}.domain.vo.result.PageResult; +import ${package}.domain.vo.result.Result; +import ${package}.domain.vo.result.ResultCodeEnum; import java.util.List; /** diff --git a/src/main/resources/vms/server/domain/dto/dto.java.vm b/src/main/resources/vms/server/domain/dto/dto.java.vm index 4de4590..10ac102 100644 --- a/src/main/resources/vms/server/domain/dto/dto.java.vm +++ b/src/main/resources/vms/server/domain/dto/dto.java.vm @@ -6,6 +6,10 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.Date; + @Data @AllArgsConstructor @NoArgsConstructor @@ -14,8 +18,8 @@ import lombok.NoArgsConstructor; public class ${classUppercaseName}Dto { #foreach($field in ${columnInfoList}) - @Schema(name = "${field.lowercaseName}", title = "${field.comment}") - private ${field.javaType} ${field.lowercaseName}; + @Schema(name = "${field.lowercaseName}", title = "${field.comment}") + private ${field.javaType} ${field.lowercaseName}; #end } \ No newline at end of file diff --git a/src/main/resources/vms/server/domain/entity/entity.java.vm b/src/main/resources/vms/server/domain/entity/entity.java.vm index f67be61..b0bc136 100644 --- a/src/main/resources/vms/server/domain/entity/entity.java.vm +++ b/src/main/resources/vms/server/domain/entity/entity.java.vm @@ -9,6 +9,10 @@ import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.time.LocalDateTime; +import java.math.BigDecimal; +import java.util.Date; + @Getter @Setter @Accessors(chain = true) @@ -17,7 +21,6 @@ import lombok.experimental.Accessors; public class ${classUppercaseName} { #foreach($field in ${columnInfoList}) - @Schema(name = "${field.lowercaseName}", title = "${field.comment}") #if($field.isPrimaryKey) @TableId(type = IdType.ASSIGN_ID) diff --git a/src/main/resources/vms/server/domain/vo/vo.java.vm b/src/main/resources/vms/server/domain/vo/vo.java.vm index fc1d185..c222aa0 100644 --- a/src/main/resources/vms/server/domain/vo/vo.java.vm +++ b/src/main/resources/vms/server/domain/vo/vo.java.vm @@ -1,21 +1,26 @@ package ${package}.domain.vo; +import java.util.Date; +import java.math.BigDecimal; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.LocalDateTime; + @Data @AllArgsConstructor @NoArgsConstructor @Schema(name = "${classUppercaseName}VO对象", title = "${comment}", description = "${comment}的VO对象") public class ${classUppercaseName}Vo { -#foreach($field in ${columnInfoList}) + #foreach($field in ${columnInfoList}) @Schema(name = "${field.lowercaseName}", title = "${field.comment}") private ${field.javaType} ${field.lowercaseName}; -#end + #end } diff --git a/src/main/resources/vms/server/mapper/mapper.java.vm b/src/main/resources/vms/server/mapper/mapper.java.vm index 5ef9e61..343733f 100644 --- a/src/main/resources/vms/server/mapper/mapper.java.vm +++ b/src/main/resources/vms/server/mapper/mapper.java.vm @@ -9,7 +9,9 @@ import ${package}.domain.entity.${classUppercaseName}; import ${package}.domain.vo.${classUppercaseName}Vo; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; - +import ${package}.domain.vo.result.PageResult; +import ${package}.domain.vo.result.Result; +import ${package}.domain.vo.result.ResultCodeEnum; import java.util.List; /** diff --git a/src/main/resources/vms/server/service/impl/serviceImpl.java.vm b/src/main/resources/vms/server/service/impl/serviceImpl.java.vm index ae1d9a3..bbed6d1 100644 --- a/src/main/resources/vms/server/service/impl/serviceImpl.java.vm +++ b/src/main/resources/vms/server/service/impl/serviceImpl.java.vm @@ -12,7 +12,9 @@ import ${package}.service.${classUppercaseName}Service; import ${package}.domain.dto.${classUppercaseName}Dto; import ${package}.domain.entity.${classUppercaseName}; import ${package}.domain.vo.${classUppercaseName}Vo; - +import ${package}.domain.vo.result.PageResult; +import ${package}.domain.vo.result.Result; +import ${package}.domain.vo.result.ResultCodeEnum; import java.util.List; /** diff --git a/src/main/resources/vms/server/service/service.java.vm b/src/main/resources/vms/server/service/service.java.vm index 84a3999..cd2575a 100644 --- a/src/main/resources/vms/server/service/service.java.vm +++ b/src/main/resources/vms/server/service/service.java.vm @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import ${package}.domain.dto.${classUppercaseName}Dto; import ${package}.domain.entity.${classUppercaseName}; import ${package}.domain.vo.${classUppercaseName}Vo; - +import ${package}.domain.vo.result.PageResult; +import ${package}.domain.vo.result.Result; +import ${package}.domain.vo.result.ResultCodeEnum; import java.util.List; /**