Merge remote-tracking branch 'origin/dev' into dev

mybatis-plus-generate/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
 /**
  * <p>
- *     代码生成器 示例
+ * 代码生成器 示例
  * </p>
  *
  * @author K神
@@ -21,81 +21,93 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
  */
 public class CodeGeneratorTest {
 
-	/**
-	 * 是否强制带上注解
-	 */
-	boolean enableTableFieldAnnotation = false;
-	/**
-	 * 生成的注解带上IdType类型
-	 */
-	IdType tableIdType = null;
-	/**
-	 * 是否去掉生成实体的属性名前缀
-	 */
-	String[] fieldPrefix = null;
+    /**
+     * 是否强制带上注解
+     */
+    boolean enableTableFieldAnnotation = false;
+    /**
+     * 生成的注解带上IdType类型
+     */
+    IdType tableIdType = null;
+    /**
+     * 是否去掉生成实体的属性名前缀
+     */
+    String[] fieldPrefix = null;
+    /**
+     * 生成的Service 接口类名是否以I开头
+     * 默认是以I开头
+     * user表 -> IUserService, UserServiceImpl
+     */
+    boolean serviceClassNameStartWithI = true;
 
-	@Test
-	public void generateCode(){
-		String packageName = "com.baomidou.springboot";
-		enableTableFieldAnnotation = false;
-		tableIdType = null;
-		generateByTables(packageName+".noannoidtype", "user");
-		enableTableFieldAnnotation = true;
-		tableIdType = null;
-		generateByTables(packageName+".noidtype", "user");
-		enableTableFieldAnnotation = false;
-		tableIdType = IdType.INPUT;
-		generateByTables(packageName+".noanno", "user");
-		enableTableFieldAnnotation = true;
-		tableIdType = IdType.INPUT;
-		generateByTables(packageName+".both", "user");
+    @Test
+    public void generateCode() {
+        String packageName = "com.baomidou.springboot";
+        enableTableFieldAnnotation = false;
+        tableIdType = null;
+        generateByTables(packageName + ".noannoidtype", "user");
+        enableTableFieldAnnotation = true;
+        tableIdType = null;
+        generateByTables(packageName + ".noidtype", "user");
+        enableTableFieldAnnotation = false;
+        tableIdType = IdType.INPUT;
+        generateByTables(packageName + ".noanno", "user");
+        enableTableFieldAnnotation = true;
+        tableIdType = IdType.INPUT;
+        generateByTables(packageName + ".both", "user");
 
-		fieldPrefix = new String[]{"test"};
-		enableTableFieldAnnotation = false;
-		tableIdType = null;
-		generateByTables(packageName+".noannoidtypewithprefix", "user");
-		enableTableFieldAnnotation = true;
-		tableIdType = null;
-		generateByTables(packageName+".noidtypewithprefix", "user");
-		enableTableFieldAnnotation = false;
-		tableIdType = IdType.INPUT;
-		generateByTables(packageName+".noannowithprefix", "user");
-		enableTableFieldAnnotation = true;
-		tableIdType = IdType.INPUT;
-		generateByTables(packageName+".withannoidtypeprefix", "user");
-	}
+        fieldPrefix = new String[]{"test"};
+        enableTableFieldAnnotation = false;
+        tableIdType = null;
+        generateByTables(packageName + ".noannoidtypewithprefix", "user");
+        enableTableFieldAnnotation = true;
+        tableIdType = null;
+        generateByTables(packageName + ".noidtypewithprefix", "user");
+        enableTableFieldAnnotation = false;
+        tableIdType = IdType.INPUT;
+        generateByTables(packageName + ".noannowithprefix", "user");
+        enableTableFieldAnnotation = true;
+        tableIdType = IdType.INPUT;
+        generateByTables(packageName + ".withannoidtypeprefix", "user");
 
-	private void generateByTables(String packageName, String... tableNames){
-		GlobalConfig config = new GlobalConfig();
-		String dbUrl = "jdbc:mysql://localhost:3306/mybatis-plus";
-		DataSourceConfig dataSourceConfig = new DataSourceConfig();
-		dataSourceConfig.setDbType(DbType.MYSQL)
-				.setUrl(dbUrl)
-				.setUsername("root")
-				.setPassword("")
-				.setDriverName("com.mysql.jdbc.Driver");
-		StrategyConfig strategyConfig = new StrategyConfig();
-		strategyConfig
-				.setCapitalMode(true)
-				.setEntityLombokModel(false)
-				.setDbColumnUnderline(true)
-				.setNaming(NamingStrategy.underline_to_camel)
-				.entityTableFieldAnnotationEnable(enableTableFieldAnnotation)
-				.fieldPrefix(fieldPrefix)//test_id -> id, test_type -> type
-				.setInclude(tableNames);//修改替换成你需要的表名，多个表名传数组
-		config.setActiveRecord(false)
-				.setIdType(tableIdType)
-				.setAuthor("K神带你飞")
-				.setOutputDir("d:\\codeGen")
-				.setFileOverride(true);
-		new AutoGenerator().setGlobalConfig(config)
-				.setDataSource(dataSourceConfig)
-				.setStrategy(strategyConfig)
-				.setPackageInfo(
-						new PackageConfig()
-								.setParent(packageName)
-								.setController("controller")
-								.setEntity("entity")
-				).execute();
-	}
+        serviceClassNameStartWithI = false;
+        generateByTables(packageName, "user");
+    }
+
+    private void generateByTables(String packageName, String... tableNames) {
+        GlobalConfig config = new GlobalConfig();
+        String dbUrl = "jdbc:mysql://localhost:3306/mybatis-plus";
+        DataSourceConfig dataSourceConfig = new DataSourceConfig();
+        dataSourceConfig.setDbType(DbType.MYSQL)
+            .setUrl(dbUrl)
+            .setUsername("root")
+            .setPassword("")
+            .setDriverName("com.mysql.jdbc.Driver");
+        StrategyConfig strategyConfig = new StrategyConfig();
+        strategyConfig
+            .setCapitalMode(true)
+            .setEntityLombokModel(false)
+            .setDbColumnUnderline(true)
+            .setNaming(NamingStrategy.underline_to_camel)
+            .entityTableFieldAnnotationEnable(enableTableFieldAnnotation)
+            .fieldPrefix(fieldPrefix)//test_id -> id, test_type -> type
+            .setInclude(tableNames);//修改替换成你需要的表名，多个表名传数组
+        config.setActiveRecord(false)
+            .setIdType(tableIdType)
+            .setAuthor("K神带你飞")
+            .setOutputDir("d:\\codeGen")
+            .setFileOverride(true);
+        if (!serviceClassNameStartWithI) {
+            config.setServiceName("%sService");
+        }
+        new AutoGenerator().setGlobalConfig(config)
+            .setDataSource(dataSourceConfig)
+            .setStrategy(strategyConfig)
+            .setPackageInfo(
+                new PackageConfig()
+                    .setParent(packageName)
+                    .setController("controller")
+                    .setEntity("entity")
+            ).execute();
+    }
 }