调整代码生成器模板

1.修复beetl模板toString格式错误
2.entity.kt.btl去除toString方法的@Override
3.entity.kt模板统一去除package和import结束符
4.controller模板统一格式
5.mapper.java.ftl统一格式
6.serviceImpl.java.ej统一格式
7.entity.kt.btl变量去除空格

mybatis-plus-generator/build.gradle

@@ -1,3 +1,10 @@
+apply plugin: 'kotlin'
+
+compileTestKotlin {
+    kotlinOptions {
+        freeCompilerArgs = ['-Xjvm-default=all']
+    }
+}
 dependencies {
     implementation project(":mybatis-plus-spring")
     implementation "${lib.velocity}"
@@ -6,6 +13,7 @@ dependencies {
     implementation "${lib.enjoy}"
     implementation "${lib.'swagger-annotations'}"
     implementation "io.springfox:springfox-swagger2:3.0.0"
+    implementation "${lib."kotlin-stdlib-jdk8"}"
 
 
     compileOnly "org.jetbrains:annotations:24.1.0"
@@ -19,5 +27,6 @@ dependencies {
     testImplementation "${lib.firebird}"
     testImplementation "${lib.'swagger-annotations'}"
     testImplementation "${lib.'logback-classic'}"
+    testImplementation "${lib.'spring-web'}"
     testCompileOnly "org.jetbrains:annotations:24.1.0"
 }

mybatis-plus-generator/src/main/resources/templates/controller.java.ej

@@ -26,7 +26,6 @@ import #(superControllerClassPackage);
 @RequestMapping("#if(package.ModuleName)/#(package.ModuleName)#end/#if(controllerMappingHyphenStyle)#(controllerMappingHyphen)#else#(table.entityPath)#end")
 #if(kotlin)
 class #(table.controllerName)#if(superControllerClass) : #(superControllerClass)()#end
-
 #else
 #if(superControllerClass)
 public class #(table.controllerName) extends #(superControllerClass) {

mybatis-plus-generator/src/main/resources/templates/controller.java.vm

@@ -26,7 +26,6 @@ import ${superControllerClassPackage};
 @RequestMapping("#if(${package.ModuleName})/${package.ModuleName}#end/#if(${controllerMappingHyphenStyle})${controllerMappingHyphen}#else${table.entityPath}#end")
 #if(${kotlin})
 class ${table.controllerName}#if(${superControllerClass}) : ${superControllerClass}()#end
-
 #else
 #if(${superControllerClass})
 public class ${table.controllerName} extends ${superControllerClass} {

mybatis-plus-generator/src/main/resources/templates/entity.java.btl

@@ -107,13 +107,13 @@ public class ${entity} {
     public String toString() {
         return "${entity}{" +
     <% for(field in table.fields){ %>
-       <% if(fieldLP.index==0){ %>
-        "${field.propertyName} = " + ${field.propertyName} +
+       <% if(fieldLP.dataIndex==0){ %>
+            "${field.propertyName} = " + ${field.propertyName} +
        <% }else{ %>
-        ", ${field.propertyName} = " + ${field.propertyName} +
+            ", ${field.propertyName} = " + ${field.propertyName} +
        <% } %>
     <% } %>
-        "}";
+            "}";
     }
 <% } %>
 }

mybatis-plus-generator/src/main/resources/templates/entity.java.ej

@@ -104,12 +104,12 @@ public class #(entity) {
         return "#(entity){" +
   #for(field : table.fields)
     #if(for.index == 0)
-        "#(field.propertyName) = " + #(field.propertyName) +
+            "#(field.propertyName) = " + #(field.propertyName) +
     #else
-        ", #(field.propertyName) = " + #(field.propertyName) +
+            ", #(field.propertyName) = " + #(field.propertyName) +
     #end
   #end
-        "}";
+            "}";
     }
 #end
 }

mybatis-plus-generator/src/main/resources/templates/entity.java.ftl

@@ -107,7 +107,7 @@ public class ${entity} {
             ", ${field.propertyName} = " + ${field.propertyName} +
         </#if>
     </#list>
-        "}";
+            "}";
     }
 </#if>
 }

mybatis-plus-generator/src/main/resources/templates/entity.java.vm

@@ -104,12 +104,12 @@ public class ${entity} {
         return "${entity}{" +
   #foreach($field in ${table.fields})
     #if($!{foreach.index}==0)
-        "${field.propertyName} = " + ${field.propertyName} +
+            "${field.propertyName} = " + ${field.propertyName} +
     #else
-        ", ${field.propertyName} = " + ${field.propertyName} +
+            ", ${field.propertyName} = " + ${field.propertyName} +
     #end
   #end
-        "}";
+            "}";
     }
 #end
 }

mybatis-plus-generator/src/main/resources/templates/entity.kt.btl

@@ -1,11 +1,11 @@
 package ${package.Entity}
 
 <% for(pkg in importEntityFrameworkPackages){ %>
-import ${pkg};
+import ${pkg}
 <% } %>
 
 <% for(pkg in importEntityJavaPackages){ %>
-import ${pkg};
+import ${pkg}
 <% } %>
 
 /**
@@ -47,9 +47,9 @@ class ${entity} {
     ${an.displayName}
     <% } %>
     <% if(field.propertyType == 'Integer'){ %>
-    var ${field.propertyName}: Int ? = null
+    var ${field.propertyName}: Int? = null
     <% }else{ %>
-    var ${field.propertyName}: ${field.propertyType} ? = null
+    var ${field.propertyName}: ${field.propertyType}? = null
     <% } %>
 
 <% } %>
@@ -73,11 +73,10 @@ class ${entity} {
 
 <% } %>
 <% if(entityToString){ %>
-    @Override
-    override fun toString(): String  {
+    override fun toString(): String {
         return "${entity}{" +
     <% for(field in table.fields){ %>
-       <% if(fieldLP.index==0){ %>
+       <% if(fieldLP.dataIndex==0){ %>
         "${field.propertyName}=" + ${field.propertyName} +
        <% }else{ %>
         ", ${field.propertyName}=" + ${field.propertyName} +

mybatis-plus-generator/src/main/resources/templates/entity.kt.ej

@@ -1,11 +1,11 @@
 package #(package.Entity);
 
 #for(pkg : importEntityFrameworkPackages)
-import #(pkg);
+import #(pkg)
 #end
 
 #for(pkg : importEntityJavaPackages)
-import #(pkg);
+import #(pkg)
 #end
 
 /**

mybatis-plus-generator/src/main/resources/templates/entity.kt.vm

@@ -1,11 +1,11 @@
 package ${package.Entity};
 
 #foreach($pkg in ${importEntityFrameworkPackages})
-import ${pkg};
+import ${pkg}
 #end
 
 #foreach($pkg in ${importEntityJavaPackages})
-import ${pkg};
+import ${pkg}
 #end
 
 /**

mybatis-plus-generator/src/main/resources/templates/mapper.java.ftl

@@ -38,4 +38,3 @@ public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
     ${m.method}
 </#list>
 }
-

mybatis-plus-generator/src/main/resources/templates/serviceImpl.java.ej

@@ -18,11 +18,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 #if(kotlin)
-open class #(table.serviceImplName) : #(superServiceImplClass)<#(table.mapperName), #(entity)>() #if(generateService), #(table.serviceName)#end {
+open class #(table.serviceImplName) : #(superServiceImplClass)<#(table.mapperName), #(entity)>()#if(generateService), #(table.serviceName) #end{
 
 }
 #else
-public class #(table.serviceImplName) extends #(superServiceImplClass)<#(table.mapperName), #(entity)> #if(generateService) implements #(table.serviceName)#end {
+public class #(table.serviceImplName) extends #(superServiceImplClass)<#(table.mapperName), #(entity)> #if(generateService)implements #(table.serviceName) #end{
 
 }
 #end