Pārlūkot izejas kodu

修复kotlin模式下swagger模式无效(freemark,velocity).

nieqiuqiu 6 gadi atpakaļ
vecāks
revīzija
f5b08a27d7

+ 11 - 1
mybatis-plus-generator/src/main/resources/templates/entity.kt.ftl

@@ -3,7 +3,10 @@ package ${package.Entity}
 <#list table.importPackages as pkg>
 <#list table.importPackages as pkg>
 import ${pkg}
 import ${pkg}
 </#list>
 </#list>
-
+<#if swagger2>
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+</#if>
 /**
 /**
  * <p>
  * <p>
  * ${table.comment}
  * ${table.comment}
@@ -15,6 +18,9 @@ import ${pkg}
 <#if table.convert>
 <#if table.convert>
 @TableName("${table.name}")
 @TableName("${table.name}")
 </#if>
 </#if>
+<#if swagger2>
+    @ApiModel(value="${entity}对象", description="${table.comment!}")
+</#if>
 <#if superEntityClass??>
 <#if superEntityClass??>
 class ${entity} : ${superEntityClass}<#if activeRecord><${entity}></#if> {
 class ${entity} : ${superEntityClass}<#if activeRecord><${entity}></#if> {
 <#elseif activeRecord>
 <#elseif activeRecord>
@@ -30,10 +36,14 @@ class ${entity} : Serializable {
 </#if>
 </#if>
 
 
 <#if field.comment!?length gt 0>
 <#if field.comment!?length gt 0>
+<#if swagger2>
+        @ApiModelProperty(value = "${field.comment}")
+<#else>
     /**
     /**
      * ${field.comment}
      * ${field.comment}
      */
      */
 </#if>
 </#if>
+</#if>
 <#if field.keyFlag>
 <#if field.keyFlag>
 <#-- 主键 -->
 <#-- 主键 -->
 <#if field.keyIdentityFlag>
 <#if field.keyIdentityFlag>

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

@@ -3,7 +3,10 @@ package ${package.Entity};
 #foreach($pkg in ${table.importPackages})
 #foreach($pkg in ${table.importPackages})
 import ${pkg};
 import ${pkg};
 #end
 #end
-
+#if(${swagger2})
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+#end
 /**
 /**
  * <p>
  * <p>
  * $!{table.comment}
  * $!{table.comment}
@@ -15,6 +18,9 @@ import ${pkg};
 #if(${table.convert})
 #if(${table.convert})
 @TableName("${table.name}")
 @TableName("${table.name}")
 #end
 #end
+#if(${swagger2})
+@ApiModel(value="${entity}对象", description="$!{table.comment}")
+#end
 #if(${superEntityClass})
 #if(${superEntityClass})
 class ${entity} : ${superEntityClass}#if(${activeRecord})<${entity}>#end() {
 class ${entity} : ${superEntityClass}#if(${activeRecord})<${entity}>#end() {
 #elseif(${activeRecord})
 #elseif(${activeRecord})
@@ -29,9 +35,13 @@ class ${entity} : Serializable {
 #set($keyPropertyName=${field.propertyName})
 #set($keyPropertyName=${field.propertyName})
 #end
 #end
 #if("$!field.comment" != "")
 #if("$!field.comment" != "")
+    #if(${swagger2})
+    @ApiModelProperty(value = "${field.comment}")
+    #else
     /**
     /**
      * ${field.comment}
      * ${field.comment}
      */
      */
+    #end
 #end
 #end
 #if(${field.keyFlag})
 #if(${field.keyFlag})
 ## 主键
 ## 主键