diff --git a/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java b/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java index 28284d5..f956944 100644 --- a/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java +++ b/src/main/java/cn/bunny/core/template/VmsTBaseTemplateGenerator.java @@ -3,6 +3,7 @@ package cn.bunny.core.template; import cn.bunny.domain.dto.VmsArgumentDto; import cn.bunny.domain.entity.TableMetaData; import cn.bunny.utils.MysqlTypeConvertUtil; +import com.google.common.base.CaseFormat; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; @@ -77,6 +78,10 @@ public class VmsTBaseTemplateGenerator extends AbstractTemplateGenerator { // 将类名称转成大驼峰 String upperCameCase = MysqlTypeConvertUtil.convertToCamelCase(handlerTableName, true); context.put("classUppercaseName", upperCameCase); + + // 添加中划线 + String lowerHyphenName = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_HYPHEN, lowerCamelCase); + context.put("lowerHyphenName", lowerHyphenName); } /** diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 49c1f3f..0275386 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,4 +17,8 @@ spring: password: ${bunny.master.password} hikari: maximum-pool-size: 20 - connection-timeout: 30000 \ No newline at end of file + connection-timeout: 30000 + +logging: + file: + path: "logs/${spring.application.name}" \ No newline at end of file diff --git a/src/main/resources/vms/server/controller/controller.java.vm b/src/main/resources/vms/server/controller/controller.java.vm index 8db4846..d0867b7 100644 --- a/src/main/resources/vms/server/controller/controller.java.vm +++ b/src/main/resources/vms/server/controller/controller.java.vm @@ -25,7 +25,7 @@ import java.util.List; */ @Tag(name = "${comment}", description = "${comment}相关接口") @RestController -@RequestMapping("${requestMapping}/${classLowercaseName}") +@RequestMapping("${requestMapping}/${lowerHyphenName}") @RequiredArgsConstructor public class ${classUppercaseName}Controller { 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 27b212c..f67be61 100644 --- a/src/main/resources/vms/server/domain/entity/entity.java.vm +++ b/src/main/resources/vms/server/domain/entity/entity.java.vm @@ -2,22 +2,27 @@ package ${package}.domain.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; -@EqualsAndHashCode(callSuper = true) @Getter @Setter @Accessors(chain = true) @TableName("${tableName}") @Schema(name = "${classUppercaseName}对象", title = "${comment}", description = "${comment}的实体类对象") -public class ${classUppercaseName} extends BaseEntity { +public class ${classUppercaseName} { - #foreach($field in ${columnInfoList}) - @Schema(name = "${field.lowercaseName}", title = "${field.comment}") - private ${field.javaType} ${field.lowercaseName}; +#foreach($field in ${columnInfoList}) + @Schema(name = "${field.lowercaseName}", title = "${field.comment}") + #if($field.isPrimaryKey) + @TableId(type = IdType.ASSIGN_ID) #end + private ${field.javaType} ${field.lowercaseName}; + +#end } \ No newline at end of file