From 9bde89f428b4c52e851c5c8d7b5265d802a9725f Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Tue, 4 Jun 2024 11:13:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=9F=E6=88=90=20Java=E3=80=81Kotli?=
 =?UTF-8?q?n=20=E4=B8=A4=E7=A7=8D=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/impl/ControllerGenerator.java   |  4 ++--
 .../generator/impl/EntityGenerator.java       | 20 +++++++++++--------
 .../generator/impl/MapperGenerator.java       |  4 ++--
 .../generator/impl/ServiceGenerator.java      |  4 ++--
 .../generator/impl/ServiceImplGenerator.java  |  4 ++--
 .../generator/impl/TableDefGenerator.java     |  4 ++--
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java
index adda7bb5..8d6b8a92 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  Copyright (c) 2022-2024, Mybatis-Flex (fuhai999@gmail.com).
  *  <p>
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class ControllerGenerator implements IGenerator {
 
         String controllerPackagePath = packageConfig.getControllerPackage().replace(".", "/");
         File controllerJavaFile = new File(sourceDir, controllerPackagePath + "/" +
-            table.buildControllerClassName() + ".java");
+            table.buildControllerClassName() + globalConfig.getFileType());
 
 
         if (controllerJavaFile.exists() && !controllerConfig.isOverwriteEnable()) {
diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java
index 54894d71..544a3fb8 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  Copyright (c) 2022-2024, Mybatis-Flex (fuhai999@gmail.com).
  *  <p>
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -55,10 +55,10 @@ public class EntityGenerator implements IGenerator {
             return;
         }
 
-        //生成 entity 类
+        // 生成 entity 类
         genEntityClass(table, globalConfig);
 
-        //生成 base 类
+        // 生成 base 类
         genBaseClass(table, globalConfig);
     }
 
@@ -72,12 +72,12 @@ public class EntityGenerator implements IGenerator {
         String entityPackagePath = packageConfig.getEntityPackage().replace(".", "/");
         String entityClassName = table.buildEntityClassName();
 
-        File entityJavaFile = new File(sourceDir, entityPackagePath + "/" + entityClassName + ".java");
+        File entityJavaFile = new File(sourceDir, entityPackagePath + "/" + entityClassName + globalConfig.getFileType());
 
         if (entityJavaFile.exists() && !entityConfig.isOverwriteEnable()) {
             return;
         }
-        //排除忽略列
+        // 排除忽略列
         if (globalConfig.getStrategyConfig().getIgnoreColumns() != null) {
             table.getColumns().removeIf(column -> globalConfig.getStrategyConfig().getIgnoreColumns().contains(column.getName().toLowerCase()));
         }
@@ -95,8 +95,12 @@ public class EntityGenerator implements IGenerator {
 
         String templatePath = this.templatePath;
 
-        //开启生成 baseClass
+        // 开启生成 baseClass
         if (entityConfig.isWithBaseClassEnable()) {
+            if (globalConfig.getFileType() == GlobalConfig.FileType.KOTLIN) {
+                throw new UnsupportedOperationException("暂不支持 Kotlin 生成 WithBaseClass 模式。");
+            }
+
             templatePath = this.entityWithBaseTemplatePath;
 
             String baseClassName = table.buildEntityClassName() + entityConfig.getWithBaseClassSuffix();
@@ -118,7 +122,7 @@ public class EntityGenerator implements IGenerator {
     protected void genBaseClass(Table table, GlobalConfig globalConfig) {
         EntityConfig entityConfig = globalConfig.getEntityConfig();
 
-        //不需要生成 baseClass
+        // 不需要生成 baseClass
         if (!entityConfig.isWithBaseClassEnable()) {
             return;
         }
@@ -135,7 +139,7 @@ public class EntityGenerator implements IGenerator {
         File baseEntityJavaFile = new File(sourceDir, baseEntityPackagePath + "/" + baseEntityClassName + ".java");
 
 
-        //排除忽略列
+        // 排除忽略列
         if (globalConfig.getStrategyConfig().getIgnoreColumns() != null) {
             table.getColumns().removeIf(column -> globalConfig.getStrategyConfig().getIgnoreColumns().contains(column.getName().toLowerCase()));
         }
diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java
index c775e00b..e3d5b52d 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  Copyright (c) 2022-2024, Mybatis-Flex (fuhai999@gmail.com).
  *  <p>
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class MapperGenerator implements IGenerator {
 
         String mapperPackagePath = packageConfig.getMapperPackage().replace(".", "/");
         File mapperJavaFile = new File(sourceDir, mapperPackagePath + "/" +
-            table.buildMapperClassName() + ".java");
+            table.buildMapperClassName() + globalConfig.getFileType());
 
 
         if (mapperJavaFile.exists() && !mapperConfig.isOverwriteEnable()) {
diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java
index c00ed5fa..73ca3ff8 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  Copyright (c) 2022-2024, Mybatis-Flex (fuhai999@gmail.com).
  *  <p>
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class ServiceGenerator implements IGenerator {
 
         String servicePackagePath = packageConfig.getServicePackage().replace(".", "/");
         File serviceJavaFile = new File(sourceDir, servicePackagePath + "/" +
-            table.buildServiceClassName() + ".java");
+            table.buildServiceClassName() + globalConfig.getFileType());
 
 
         if (serviceJavaFile.exists() && !serviceConfig.isOverwriteEnable()) {
diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java
index 736d818b..746a83ce 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  Copyright (c) 2022-2024, Mybatis-Flex (fuhai999@gmail.com).
  *  <p>
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class ServiceImplGenerator implements IGenerator {
 
         String serviceImplPackagePath = packageConfig.getServiceImplPackage().replace(".", "/");
         File serviceImplJavaFile = new File(sourceDir, serviceImplPackagePath + "/" +
-            table.buildServiceImplClassName() + ".java");
+            table.buildServiceImplClassName() + globalConfig.getFileType());
 
 
         if (serviceImplJavaFile.exists() && !serviceImplConfig.isOverwriteEnable()) {
diff --git a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
index ac298555..49ae76f2 100644
--- a/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
+++ b/mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *  Copyright (c) 2022-2024, Mybatis-Flex (fuhai999@gmail.com).
  *  <p>
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ public class TableDefGenerator implements IGenerator {
 
         String tableDefPackagePath = packageConfig.getTableDefPackage().replace(".", "/");
         File tableDefJavaFile = new File(sourceDir, tableDefPackagePath + "/" +
-            table.buildTableDefClassName() + ".java");
+            table.buildTableDefClassName() + globalConfig.getFileType());
 
 
         if (tableDefJavaFile.exists() && !tableDefConfig.isOverwriteEnable()) {