admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 01:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!60 feat: 用户可自定义 lombok 注解配置

Browse Source 
Merge pull request !60 from 王帅/main
This commit is contained in:
Michael Yang 2023-06-11 02:41:57 +00:00 committed by Gitee
commit 2200086791
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java
View File

@ -128,18 +128,6 @@ public class Table {
EntityConfig entityConfig = globalConfig.getEntityConfig();
//开启 lombok
if (entityConfig.isWithLombok()) {
//import lombok.AllArgsConstructor;
//import lombok.Builder;
//import lombok.Data;
//import lombok.NoArgsConstructor;
imports.add("lombok.AllArgsConstructor");
imports.add("lombok.Builder");
imports.add("lombok.Data");
imports.add("lombok.NoArgsConstructor");
}
if (entityConfig.getSupperClass() != null) {
imports.add(entityConfig.getSupperClass().getName());
}
@ -277,16 +265,6 @@ public class Table {
*/
public String buildTableAnnotation() {
StringBuilder tableAnnotation = new StringBuilder();
if (globalConfig.getEntityConfig().isWithLombok()) {
//@Data
//@Builder
//@NoArgsConstructor
//@AllArgsConstructor
tableAnnotation.append("@Data\n");
tableAnnotation.append("@Builder\n");
tableAnnotation.append("@NoArgsConstructor\n");
tableAnnotation.append("@AllArgsConstructor\n");
}
tableAnnotation.append("@Table(value = \"").append(name).append("\"");

15
mybatis-flex-codegen/src/main/resources/templates/enjoy/entity.tpl
View File

@ -1,8 +1,15 @@
#set(withLombok = entityConfig.isWithLombok())
package #(packageConfig.entityPackage);
#for(importClass : table.buildImports())
import #(importClass);
#end
#if(withLombok)
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
#end
/**
* #(table.getComment()) 实体类。
@ -10,6 +17,12 @@ import #(importClass);
* @author #(javadocConfig.getAuthor())
* @since #(javadocConfig.getSince())
*/
#if(withLombok)
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
#end
#(table.buildTableAnnotation())
public class #(table.buildEntityClassName())#(table.buildExtends())#(table.buildImplements()) {
#for(column : table.columns)
@ -18,7 +31,7 @@ public class #(table.buildEntityClassName())#(table.buildExtends())#(table.build
#(column.buildAnnotations())private #(column.propertySimpleType) #(column.property);
#end
#if(!entityConfig.isWithLombok())
#if(!withLombok)
#for(column: table.columns)
public #(column.propertySimpleType) #(column.getterMethod())() {
return #(column.property);

7
mybatis-flex-codegen/src/test/java/com/mybatisflex/codegen/test/GeneratorTest.java
View File

@ -20,6 +20,7 @@ import com.mybatisflex.codegen.Generator;
import com.mybatisflex.codegen.config.GlobalConfig;
import com.mybatisflex.spring.service.impl.CacheableServiceImpl;
import com.zaxxer.hikari.HikariDataSource;
import org.junit.Test;
import java.util.function.UnaryOperator;
@ -82,7 +83,7 @@ public class GeneratorTest {
generator.generate();
}
// @Test
@Test
public void testCodeGen2() {
//配置数据源
HikariDataSource dataSource = new HikariDataSource();
@ -112,8 +113,8 @@ public class GeneratorTest {
.setGenerateTable("sys_user");
//设置模板路径
globalConfig.getTemplateConfig()
.setEntity("D:\\Documents\\配置文件\\entity.tpl");
//globalConfig.getTemplateConfig()
// .setEntity("D:\\Documents\\配置文件\\entity.tpl");
//配置生成 entity
globalConfig.enableEntity()